[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.33.0-16-gd08d06c

[X2Go dev team]

The branch, twofactorauth has been updated
       via  d08d06c673492581f4d97852bd9bd0e47d75e7e4 (commit)
      from  9af2f65f7ec65f0a37365ebe0332be2a6ab246f0 (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:
 debian/control           |    1 +
 pyhoca/wxgui/about.py    |    8 ++------
 pyhoca/wxgui/basepath.py |    6 +-----
 pyhoca/wxgui/frontend.py |   12 ++++--------
 pyhoca/wxgui/logon.py    |   17 +++++++----------
 5 files changed, 15 insertions(+), 29 deletions(-)

The diff of changes is:
diff --git a/debian/control b/debian/control
index bf8a1b8..cd07697 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  python-support,
  python-distutils-extra,
  python-paramiko,
+ python-x2go (>=0.0.42.0-0~x2go1),
  wx-common(>=2.8.10.0),
  python-wxtools (>=2.8.10.0)
 Standards-Version: 3.9.1
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index 3f27d9b..855d1a4 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -32,12 +32,8 @@ try:
     wxversion.select('2.8')
 except: pass
 
-try:
-    # Python X2go
-    import x2go
-except ImportError:
-    # avoid the above modules in build dependencies when packaging
-    pass
+# Python X2go
+import x2go
 
 # wxPython
 import wx
diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py
index 99bdc5d..56fd4e2 100644
--- a/pyhoca/wxgui/basepath.py
+++ b/pyhoca/wxgui/basepath.py
@@ -19,11 +19,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os
-try:
-    from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS
-except:
-    # avoiding build-deps
-    _X2GOCLIENT_OS="Linux"
+from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS
 
 if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
     _base_location = os.path.abspath(os.path.curdir)
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 51e11c5..7e7af1c 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -37,14 +37,10 @@ except: pass
 import os
 
 # Python X2go
-try:
-    import x2go
-    import gevent
-    import gevent.monkey
-    gevent.monkey.patch_all()
-except ImportError:
-    # to work around failing build dependencies during egg setup
-    pass
+import x2go
+import gevent
+import gevent.monkey
+gevent.monkey.patch_all()
 
 import wx
 
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index a4b698a..07a9f11 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -30,16 +30,13 @@ try:
     wxversion.select('2.8')
 except: pass
 
-try:
-    # Python X2go
-    import x2go
-
-    # gevent
-    import gevent
-    import gevent.monkey
-    gevent.monkey.patch_all()
-except ImportError:
-    pass
+# Python X2go
+import x2go
+
+# gevent
+import gevent
+import gevent.monkey
+gevent.monkey.patch_all()
 
 import wx
 import wx.lib.scrolledpanel as scrolled


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).