The branch, statusflag has been updated via a856cf9c04098e9510b4122adb8ff7fc45414cc2 (commit) from fbc66ef6eb8ae946d405060acd446d9a3a92be2e (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 a856cf9c04098e9510b4122adb8ff7fc45414cc2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 4 21:45:16 2013 +0200 make sure the upper() method is applied to a unicode object ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index e3cb489..af179b4 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -150,7 +150,7 @@ def ping(query_mode='LOCAL', remote_agent=None): """ username='foo' - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='ping') else: return call_remote_broker_agent(username, mode='ping', remote_agent=remote_agent) @@ -168,7 +168,7 @@ def list_sessions(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='listsessions') else: return call_remote_broker_agent(username, mode='listsessions', remote_agent=remote_agent) @@ -208,7 +208,7 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': server_list = call_local_broker_agent(username, mode='findbusyservers') else: server_list = call_remote_broker_agent(username, mode='findbusyservers', remote_agent=remote_agent) @@ -240,7 +240,7 @@ def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/aut @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ]) else: return call_remote_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) @@ -272,7 +272,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/ delayed_execution(delete_authorized_key, delay=delay_deletion, username=username, pubkey_hash=pubkey_hash, authorized_keys_file=authorized_keys_file, query_mode=query_mode, remote_agent=remote_agent, ) logger_broker.debug('Scheduled deletion of authorized key in {delay}s: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname)) else: - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ]) else: return call_remote_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) @@ -292,7 +292,7 @@ def get_servers(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='getservers') else: return call_local_broker_agent(username, mode='getservers', remote_agent=remote_agent) 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).