The branch, master has been updated via f92e46470950844b11135ac506f7b719f8ca2304 (commit) from ae5433d8653adaa364329001aa10f55d76f15a65 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f92e46470950844b11135ac506f7b719f8ca2304 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 1 18:46:49 2013 +0200 Fix Python2'isms in three exceptions. Thanks to Mathias Ewald for spotting. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 2 +- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 46c5103..b23f1ad 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -206,7 +206,7 @@ if __name__ == "__main__": http_server = tornado.httpserver.HTTPServer(application) http_server.listen(bind_port, address=bind_address) tornado.ioloop.IOLoop.instance().start() - except socket.error, e: + except socket.error as e: print (e) elif cmdline_args.mode.upper() == 'SSH': diff --git a/debian/changelog b/debian/changelog index 4ae73c2..8bcced1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - New broker session profile parameter: broker-agent-query-mode. Define agent query methods per session profile. - Rename base broker's use_session_autologin to get_session_autologin. + - Fix Python2'isms in three exceptions. Thanks to Mathias Ewald for + spotting. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index f98f984..7d39f43 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -335,9 +335,9 @@ class X2GoBroker(object): try: _allow_address_set = netaddr.IPSet(_acls_clients_allow) _deny_address_set = netaddr.IPSet(_acls_clients_deny) - except netaddr.core.AddrFormatError, e: + except netaddr.core.AddrFormatError as e: logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e))) - except ValueError, e: + except ValueError as e: logger_error.error('base_broker.X2GoBroker.check_acls(): ValueError - {why}'.format(why=str(e))) _allow_client = self._client_address in _allow_address_set hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).