[X2Go-Commits] x2gobroker.git - tmp (branch) updated: 0.0.0.5-53-g4a05d34

X2Go dev team git-admin at x2go.org
Tue Apr 23 21:08:57 CEST 2013


The branch, tmp has been updated
       via  4a05d3411c0da68f013201e68b396f77a082344e (commit)
      from  01f3a1d9c79f9bf60a28e1c20250afdb5abc09f0 (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 96d435c..d45f5d0 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, slug):
-        return self.post(slug)
+    def get(self, backend):
+        return self.post(backend)
 
-    def post(self, slug):
+    def post(self, backend):
 
-        if not slug:
+        if not backend:
             backend = _X2GOBROKER_DEFAULT_BACKEND
         else:
-            backend = slug.rstrip('/')
+            backend = backend.rstrip('/')
 
         # silence pyflakes...
         broker_backend = None
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index ac012d0..e4fa9aa 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, slug):
+    def get(self, backend):
         if x2gobroker.defaults.X2GOBROKER_DEBUG:
             logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG')
-            return self.post(slug)
+            return self.post(backend)
         raise tornado.web.HTTPError(404)
 
-    def post(self, slug):
+    def post(self, backend):
 
-        if not slug:
+        if not backend:
             backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND
         else:
-            backend = slug.rstrip('/')
+            backend = backend.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