[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.2-1-gc8f2ebd

X2go dev team git-admin at x2go.org
Sun Jun 19 22:14:39 CEST 2011


The branch, master has been updated
       via  c8f2ebd5b8455a4ca953cd368bd515b6bcb9ac95 (commit)
      from  cf20bd0e4f17055d90aa7cf2c88c06f6344d95f2 (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 -----------------------------------------------------------------
commit c8f2ebd5b8455a4ca953cd368bd515b6bcb9ac95
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jun 19 22:15:20 2011 +0200

    Fix utf-8 errors during authentication.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog         |    6 ++++++
 pyhoca/wxgui/frontend.py |   14 +++++++-------
 pyhoca/wxgui/logon.py    |    6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 132c17a..ca28f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-gui (0.1.0.3-0~x2go1) UNRELEASED; urgency=low
+
+  * Fix utf-8 errors during authentication.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 19 Jun 2011 22:14:22 +0200
+
 pyhoca-gui (0.1.0.2-0~x2go1) unstable; urgency=low
 
   * New upstream release (0.1.0.2):
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index f33d494..2d2f2b5 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -356,35 +356,35 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True )
             self._logon_windows[profile_name] = _logon_window
         except x2go.SSHException, e:
-            self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000)
             try:
                 self._temp_disabled_profile_names.remove(profile_name)
             except ValueError:
                 pass
             connect_failed = True
         except x2go.X2goHostKeyException, e:
-            self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - host key error') % profile_name, u'%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000)
             try:
                 self._temp_disabled_profile_names.remove(profile_name)
             except ValueError:
                 pass
             connect_failed = True
         except x2go.X2goSSHProxyHostKeyException, e:
-            self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - host key error') % profile_name, u'%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), 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 - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % 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 - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % e.strerror, icon='auth_error', timeout=4000)
             try:
                 self._temp_disabled_profile_names.remove(profile_name)
             except ValueError:
@@ -398,14 +398,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                 pass
             connect_failed = True
         except x2go.X2goSSHProxyException, e:
-            self.notifier.send(_(u'%s - auth key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - auth key error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000)
             try:
                 self._temp_disabled_profile_names.remove(profile_name)
             except ValueError:
                 pass
             connect_failed = True
         except:
-            self.notifier.send('%s - connect error' % profile_name, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000)
+            self.notifier.send('%s - connect error' % profile_name, _(u'An unknown error occurred during authentication!'), icon='auth_error', timeout=4000)
             try:
                 self._temp_disabled_profile_names.remove(profile_name)
             except ValueError:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index cd2dfb0..81672f1 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -302,21 +302,21 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
         except gevent.dns.DNSError, e:
             self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
                                              title=_(u'%s - connect error') % self.current_profile_name, 
-                                             text='%s!' % e.strerror,
+                                             text=u'%s!' % e.strerror,
                                              icon='auth_error')
             connect_failed = True
 
         except gevent.socket.error, e:
             self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
                                              title=_(u'%s - connect error') % self.current_profile_name, 
-                                             text='%s!' % e.strerror,
+                                             text=u'%s!' % e.strerror,
                                              icon='auth_error')
             connect_failed = True
 
         except x2go.X2goHostKeyException, e:
             self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
                                              title=_(u'%s - host key error') % self.current_profile_name, 
-                                             text='%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), 
+                                             text=u'%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), 
                                              icon='auth_error', 
                                              timeout=4000)
             connect_failed = True


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