[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-40-g169a3bb
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:12 CEST 2013
The branch, build-main has been updated
via 169a3bb77b455408af57f65ab47ed1ea63df4287 (commit)
from 1c5e41f4849a2c8273eb96bf09b5c9993a9c7a3f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
test.py | 1 -
x2gobroker/agent.py | 2 +-
x2gobroker/brokers/base_broker.py | 1 -
x2gobroker/brokers/ldap_broker.py | 2 +-
x2gobroker/web/json.py | 1 -
x2gobroker/web/plain.py | 1 -
6 files changed, 2 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/test.py b/test.py
index a8c53df..b04e9ee 100755
--- a/test.py
+++ b/test.py
@@ -22,7 +22,6 @@
Unit tests for Python X2GoBroker.
"""
import os
-import logging
if __name__ == "__main__":
os.environ.update({'X2GOBROKER_DEBUG': "1"})
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 72e95e3..3fe9feb 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -133,7 +133,7 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None):
if server_list:
for server_item in server_list.split('\n'):
- usage, server = line.split(':')
+ usage, server = server_item.split(':')
server_usage.update({ server: int(usage) })
return server_usage
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 1f71430..13235cb 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -289,7 +289,6 @@ class X2GoBroker(object):
_acls_clients_allow = copy.deepcopy(_acls[u'acl-clients-allow'])
_acls_clients_deny = copy.deepcopy(_acls[u'acl-clients-deny'])
- _addr = self.get_client_address()
_allow_client = False
_deny_client = False
diff --git a/x2gobroker/brokers/ldap_broker.py b/x2gobroker/brokers/ldap_broker.py
index 61857d8..8f631ab 100644
--- a/x2gobroker/brokers/ldap_broker.py
+++ b/x2gobroker/brokers/ldap_broker.py
@@ -25,7 +25,7 @@ L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDA
__NAME__ = 'x2gobroker-pylib'
# modules
-import x2gobroker.base_broker as base
+import x2gobroker.base
class X2GoBroker(x2gobroker.base.X2GoBroker):
"""\
diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py
index b879b77..04743b5 100644
--- a/x2gobroker/web/json.py
+++ b/x2gobroker/web/json.py
@@ -21,7 +21,6 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
# modules
-import web
class X2GoBrokerWebJson:
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 22b14ba..70ce4a6 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -60,7 +60,6 @@ class X2GoBrokerWebPlain:
exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend))
exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend))
global_config = broker_backend.get_global_config()
- backend_config = broker_backend.get_backend_config()
# set the client address for the broker backend
ip = web.ctx.env.get('HTTP_X_FORWARDED_FOR', web.ctx.get('ip', ''))
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).
More information about the x2go-commits
mailing list