[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-234-g93e268e

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:09 CEST 2013


The branch, twofactorauth has been updated
       via  93e268e71d8e8903f711ad46f10da4d94c5cfa07 (commit)
      from  b3dc28e7af5b2a89a2665ed886c3d5577503e4ca (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/changelog         |    1 +
 pyhoca/wxgui/frontend.py |   14 +++++++-------
 pyhoca/wxgui/logon.py    |   12 ++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 49125f9..fa0216b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -123,6 +123,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       applications.
     - Windows packaging: remove dist directory before calling py2exe.
     - For empty menu maps create a dummy menu.
+    - Python gevent will drop gevent.dns in v1.0. Not using it anymore.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 4ef68a4..bff85d4 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -518,13 +518,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             except ValueError:
                 pass
             connect_failed = True
-        except gevent.dns.DNSError, e:
-            self.notifier.send(_(u'%s - DNS error') % profile_name, e.strerror, icon='auth_error', timeout=4000)
-            try:
-                self._temp_disabled_profile_names.remove(profile_name)
-            except ValueError:
-                pass
-            connect_failed = True
+        #except gevent.dns.DNSError, e:
+        #    self.notifier.send(_(u'%s - DNS error') % profile_name, e.strerror, icon='auth_error', timeout=4000)
+        #    try:
+        #        self._temp_disabled_profile_names.remove(profile_name)
+        #    except ValueError:
+        #        pass
+        #    connect_failed = True
         except gevent.socket.error, e:
             self.notifier.send(_(u'%s - socket error') % profile_name, e.strerror, icon='auth_error', timeout=4000)
             try:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 4cb2b52..7da54b2 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -338,12 +338,12 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
             self.cancelBtn.Enable(True)
             return
 
-        except gevent.dns.DNSError, e:
-            self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
-                                             title=_(u'%s - DNS error') % self.current_profile_name, 
-                                             text=e.strerror + '!',
-                                             icon='auth_error')
-            connect_failed = True
+        #except gevent.dns.DNSError, e:
+        #    self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
+        #                                     title=_(u'%s - DNS error') % self.current_profile_name, 
+        #                                     text=e.strerror + '!',
+        #                                     icon='auth_error')
+        #    connect_failed = True
 
         except gevent.socket.error, e:
             self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 


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




More information about the x2go-commits mailing list