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

[X2Go dev team]

The branch, build-main has been updated
       via  1333f57a70b1c03a127d6995cdc0ddd171c19b84 (commit)
      from  f395518f6ce01794e96aae35014225d29c594505 (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  |   19 ++++++-------------
 x2gobroker/web/plain.py |   18 ++++++------------
 2 files changed, 12 insertions(+), 25 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py
index d45f5d0..9992936 100644
--- a/x2gobroker/web/html.py
+++ b/x2gobroker/web/html.py
@@ -84,22 +84,15 @@ $output
         if not backend_config['enable']:
             raise tornado.web.HTTPError(404)
 
-        try: username = self.get_argument('user', default='')
-        except AttributeError: username = ''
-        try: password = self.get_argument('password', default='')
-        except AttributeError: password = ''
-        try: cookie = self.get_argument('cookie', default='')
-        except AttributeError: cookie = ''
-        try: task = self.get_argument('task')
-        except AttributeError: task = ''
-        try: profile_id = self.get_argument('sid', default='')
-        except AttributeError: profile_id = ''
-        try: new_password = self.get_argument('newpass', default='')
-        except AttributeError: new_password = ''
+        username = self.get_argument('user', default='')
+        password = self.get_argument('password', default='')
+        cookie = self.get_argument('cookie', default='')
+        task = self.get_argument('task')
+        profile_id = self.get_argument('sid', default='')
+        new_password = self.get_argument('newpass', default='')
 
         output = ''
         self._gen_http_header()
-        self._gen_http_header()
 
         if broker_backend.check_access(username=username, password=password, authid=authid):
 
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index e4fa9aa..a3a6c16 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -75,18 +75,12 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
         if not broker_backend.is_enabled():
             raise tornado.web.HTTPError(404)
 
-        try: username = self.get_argument('user', default='')
-        except AttributeError: username = ''
-        try: password = self.get_argument('password', default='')
-        except AttributeError: password = ''
-        try: cookie = self.get_argument('cookie', default='')
-        except AttributeError: cookie = ''
-        try: task = self.get_argument('task', default='')
-        except AttributeError: task = ''
-        try: profile_id = self.get_argument('sid', default='')
-        except AttributeError: profile_id = ''
-        try: new_password = self.get_argument('newpass', default='')
-        except AttributeError: new_password = ''
+        username = self.get_argument('user', default='')
+        password = self.get_argument('password', default='')
+        cookie = self.get_argument('cookie', default='')
+        task = self.get_argument('task', default='')
+        profile_id = self.get_argument('sid', default='')
+        new_password = self.get_argument('newpass', default='')
 
         output = ''
         self._gen_http_header()


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).