This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 55651b6 brokerlogin.py: Fix parameter error when evoking message box. new e81332b No extra BR on gettext, intltool will pull it in anyway. new eee3917 More reliably handle errors in a given --broker-url option value. new 9d57084 formalistic code cleanup using pyflakes new cbc87c0 add binary files of the Estonian translation (for win32 releases) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: build/mo/et/LC_MESSAGES/PyHoca-GUI.mo | Bin 0 -> 31489 bytes debian/changelog | 2 ++ pyhoca-gui | 3 --- pyhoca-gui.spec | 1 - pyhoca/wxgui/brokerlogon.py | 3 --- pyhoca/wxgui/frontend.py | 11 ++++++++--- pyhoca/wxgui/launcher.py | 4 ---- pyhoca/wxgui/listdesktops.py | 3 --- pyhoca/wxgui/menus_taskbar.py | 3 +-- pyhoca/wxgui/notify.py | 1 - pyhoca/wxgui/profilemanager.py | 1 - pyhoca/wxgui/serverinfo.py | 3 --- pyhoca/wxgui/sessiontitle.py | 3 --- pyhoca/wxgui/taskbar.py | 6 ------ setup.py | 18 ++++++++++++------ 15 files changed, 23 insertions(+), 39 deletions(-) create mode 100644 build/mo/et/LC_MESSAGES/PyHoca-GUI.mo -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit e81332b0f66954d18d34488ea2b999aae6d22717 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Oct 18 21:34:06 2014 +0200 No extra BR on gettext, intltool will pull it in anyway. --- debian/changelog | 1 + pyhoca-gui.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index de71e63..83260b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low 13.1, pyhoca-gui segfaults with wxPython 2.8). + Try to build the .po -> .mo files during package build. + Install locale files into bin:package. + + No extra BR on gettext, intltool will pull it in anyway. [ Mike DePaulo ] * New upstream version (0.5.0.0): diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index 43757d9..83b343f 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -13,7 +13,6 @@ URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: gettext %if 0%{?suse_version} BuildRequires: python-devel BuildRequires: fdupes -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit eee39178b7255c7e710d76a849bbc66fd575dbd9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 20 09:25:12 2014 +0200 More reliably handle errors in a given --broker-url option value. --- debian/changelog | 1 + pyhoca/wxgui/frontend.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83260b7..0cfc589 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low - pyhoca-gui.desktop: Set Categories: to Network;RemoteAccess;. - setup.py: Install .mo files into DESTDIR. - brokerlogin.py: Fix parameter error when evoking message box. + - More reliably handle errors in a given --broker-url option value. * debian/control: + Add D (bin:package pyhoca-gui): python-cups. (Fixes: #460). * pyhoca-gui.spec: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 6aba1de..c59c1c3 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -21,6 +21,7 @@ modules ={} import os +import re # Python X2Go import x2go @@ -201,9 +202,13 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): self.broker_autoconnect = self.args.broker_autoconnect if self.args.broker_url: - if self.args.broker_url in ('HTTP', 'SSH'): - self.broker_autoconnect = True _x2goclient_kwargs['broker_url'] = self.args.broker_url + if not re.match('^(http://|https://|ssh://).*', self.args.broker_url): + self.broker_autoconnect = True + else: + if not re.match('(http|ssh)', self.args.broker_url.lower()): + # fall back broker mode... -> HTTP (and trigger querying for the exact URL) + _x2goclient_kwargs['broker_url'] = 'HTTP' self.with_brokerage = True else: self.with_brokerage = False -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 9d57084a587a920bc987c932a46280a9783b02ce Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 20 11:10:52 2014 +0200 formalistic code cleanup using pyflakes --- pyhoca-gui | 3 --- pyhoca/wxgui/brokerlogon.py | 3 --- pyhoca/wxgui/frontend.py | 2 +- pyhoca/wxgui/launcher.py | 4 ---- pyhoca/wxgui/listdesktops.py | 3 --- pyhoca/wxgui/menus_taskbar.py | 3 +-- pyhoca/wxgui/notify.py | 1 - pyhoca/wxgui/profilemanager.py | 1 - pyhoca/wxgui/serverinfo.py | 3 --- pyhoca/wxgui/sessiontitle.py | 3 --- pyhoca/wxgui/taskbar.py | 6 ------ setup.py | 18 ++++++++++++------ 12 files changed, 14 insertions(+), 36 deletions(-) diff --git a/pyhoca-gui b/pyhoca-gui index f1d2c0c..6761d3b 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -19,9 +19,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -import os -import sys - try: import wxversion wxversion.select(['3.0', '2.9', '2.8']) diff --git a/pyhoca/wxgui/brokerlogon.py b/pyhoca/wxgui/brokerlogon.py index 6e59995..af581db 100644 --- a/pyhoca/wxgui/brokerlogon.py +++ b/pyhoca/wxgui/brokerlogon.py @@ -23,9 +23,6 @@ modules ={} # Python X2Go import x2go -# gevent -import gevent - import wx import os diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index c59c1c3..da8afba 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -832,7 +832,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): @type evt: C{obj} """ - _broker_logon_window = brokerlogon.PyHocaGUI_BrokerDialogBoxPassword(self, caller=self) + brokerlogon.PyHocaGUI_BrokerDialogBoxPassword(self, caller=self) def OnBrokerDisconnect(self, evt): """\ diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index 152d239..03d3384 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -22,7 +22,6 @@ modules ={} import sys import os -import re import shutil import argparse import gettext @@ -47,7 +46,6 @@ from messages import PyHoca_MessageWindow_Ok import defaults import basepath -import taskbar class PyHocaGUI_Launcher(object): @@ -126,7 +124,6 @@ VERSION: %s my_display = os.environ['DISPLAY'] open(my_pidfile, 'w').write(my_display) - already_running_for_this_display = False for pidfile in os.listdir(os.path.expanduser("~/.x2go/{progname}/".format(progname=_executable))): # this is our own pid file... @@ -300,7 +297,6 @@ VERSION: %s else: _option_groups = ((p_guiopts, x2go_gui_options), (p_brokeropts, broker_options), (p_debugopts, debug_options), (p_portableopts, portable_options), (p_backendopts, backend_options), ) for (p_group, opts) in _option_groups: - required = False for opt in opts: args = opt['args'] diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py index d6010cf..8910430 100644 --- a/pyhoca/wxgui/listdesktops.py +++ b/pyhoca/wxgui/listdesktops.py @@ -23,9 +23,6 @@ modules ={} # Python X2Go import x2go -# gevent -import gevent - import wx import os diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 45a68f0..4173573 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -20,7 +20,6 @@ import os.path import wx -import re import StringIO import base64 @@ -576,7 +575,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART) elif _command == 'SHADOW': - start_shadow_session = self.Append(id=ID_SHADOWSESSIONSTART, text=_(u"Start Desktop Sharing Session")) + self.Append(id=ID_SHADOWSESSIONSTART, text=_(u"Start Desktop Sharing Session")) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShadowSessionStart, id=ID_SHADOWSESSIONSTART) elif _command == '' and _published: diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index db1ceba..29e6eaf 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -25,7 +25,6 @@ if X2GOCLIENT_OS in ('Linux', 'Mac'): import pynotify import exceptions import basepath -from taskbar import MakeIcon import x2go.utils as utils diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 1aae3d2..ab10724 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -22,7 +22,6 @@ import wx import os import copy import types -import re import x2go.log as log import x2go.utils as utils diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py index 6e5bdd8..4466f00 100644 --- a/pyhoca/wxgui/serverinfo.py +++ b/pyhoca/wxgui/serverinfo.py @@ -23,9 +23,6 @@ modules ={} # Python X2Go import x2go -# gevent -import gevent - import wx import os diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 14edff8..a6ec438 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -23,9 +23,6 @@ modules ={} # Python X2Go import x2go -# gevent -import gevent - import wx import os diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index e8847cf..4dfb0ae 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -23,13 +23,7 @@ modules ={} # Python X2Go import x2go -import gevent - import wx - -if x2go.X2GOCLIENT_OS == 'Windows': - import win32gui - import os # PyHoca-GUI modules diff --git a/setup.py b/setup.py index c115f56..8e12901 100755 --- a/setup.py +++ b/setup.py @@ -29,10 +29,14 @@ UNINSTALL_NAME = 'PyHoca-GUI (A graphical X2Go client)' SCRIPT_NAME = 'pyhoca-gui' PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME PROGRAM_DESC_SHORT = '%s is a graphical X2Go client.' % PROGRAM_NAME + +# silence pyflakes with assigning a dummy version here... the real __VERSION__ assignment happens below +__VERSION__ = '0.0.0.0' for line in file(os.path.join('pyhoca', 'wxgui', '__init__.py')).readlines(): if (line.startswith('__VERSION__')): exec(line.strip()) PROGRAM_VERSION = __VERSION__ + PROGRAM_ICON = "pixmaps/pyhoca_x2go-logo-ubuntu.ico" # Windows: UNINSTALL_ICON is for add/remove programs. UNINSTALL_ICON = "icons\\pyhoca-gui.ico" @@ -46,8 +50,8 @@ if platform.system() == 'Windows': REGULAR_NSIS = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe') UNICODE_NSIS = os.path.join(os.environ['ProgramFiles'], 'NSIS','Unicode', 'makensis.exe') -from setuptools import setup, find_packages -from distutils.core import setup, Command +from setuptools import setup +from distutils.core import Command base = None executables = [] @@ -76,7 +80,9 @@ if platform.system() == 'Windows': sys.path.append(os.path.normpath('../pyhoca-contrib/mswin/ms-vc-runtime')) elif platform.system() == 'Linux': - from DistUtilsExtra.command import * + import DistUtilsExtra.command.build_extra + import DistUtilsExtra.command.build_i18n + import DistUtilsExtra.command.clean_i18n py2exe = object Freezer = object @@ -289,9 +295,9 @@ if platform.system() == 'Windows': elif platform.system() == 'Linux': cmd_class.update( { - "build" : build_extra.build_extra, - "build_i18n" : build_i18n.build_i18n, - "clean": clean_i18n.clean_i18n, + "build" : DistUtilsExtra.command.build_extra.build_extra, + "build_i18n" : DistUtilsExtra.command.build_i18n.build_i18n, + "clean": DistUtilsExtra.command.clean_i18n.clean_i18n, } ) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit cbc87c0e10dd04fc572f027d69ae8cb9feb00acc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 20 11:12:10 2014 +0200 add binary files of the Estonian translation (for win32 releases) --- build/mo/et/LC_MESSAGES/PyHoca-GUI.mo | Bin 0 -> 31489 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/build/mo/et/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/et/LC_MESSAGES/PyHoca-GUI.mo new file mode 100644 index 0000000..a7e8090 Binary files /dev/null and b/build/mo/et/LC_MESSAGES/PyHoca-GUI.mo differ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org