[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-52-g01f3a1d

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:23 CEST 2013


The branch, build-main has been updated
       via  01f3a1d9c79f9bf60a28e1c20250afdb5abc09f0 (commit)
      from  391fa36de255a6e17e817fe7127d85f81db015ee (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:
 x2gobroker/web/html.py  |   10 +++++-----
 x2gobroker/web/plain.py |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py
index d45f5d0..96d435c 100644
--- a/x2gobroker/web/html.py
+++ b/x2gobroker/web/html.py
@@ -64,15 +64,15 @@ $output
         for http_header_item in self.http_header_items.keys():
             self.add_header(http_header_item, self.http_header_items[http_header_item])
 
-    def get(self, backend):
-        return self.post(backend)
+    def get(self, slug):
+        return self.post(slug)
 
-    def post(self, backend):
+    def post(self, slug):
 
-        if not backend:
+        if not slug:
             backend = _X2GOBROKER_DEFAULT_BACKEND
         else:
-            backend = backend.rstrip('/')
+            backend = slug.rstrip('/')
 
         # silence pyflakes...
         broker_backend = None
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index e4fa9aa..ac012d0 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -41,18 +41,18 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
         for http_header_item in self.http_header_items.keys():
             self.add_header(http_header_item, self.http_header_items[http_header_item])
 
-    def get(self, backend):
+    def get(self, slug):
         if x2gobroker.defaults.X2GOBROKER_DEBUG:
             logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG')
-            return self.post(backend)
+            return self.post(slug)
         raise tornado.web.HTTPError(404)
 
-    def post(self, backend):
+    def post(self, slug):
 
-        if not backend:
+        if not slug:
             backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND
         else:
-            backend = backend.rstrip('/')
+            backend = slug.rstrip('/')
 
         # silence pyflakes...
         broker_backend = None


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