This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-gui. commit 49a88d6164ec9f404fce729cff67911d2e954e61 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 20:13:18 2014 +0100 Provide mswin_logging as separate module in pyhoca.wxgui namespace, undo earlier namespace split-off. --- debian/changelog | 3 +-- pyhoca-gui | 2 +- pyhoca/mswin/__init__.py | 20 -------------------- pyhoca/wxgui/__init__.py | 3 --- pyhoca/wxgui/launcher.py | 3 ++- pyhoca/{mswin => wxgui}/mswin_logging.py | 0 setup.py | 4 +--- 7 files changed, 5 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a49617..46bd578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,12 +11,11 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * Make SCRIPT_NAME in setup.py configurable (monkey-patchable). * Make setup.py importable, only run setup() function on direct calls. * Don't refer to py2exe anymore in nsis_template's naming scheme. - * Move setup_mswinlog to a separate module namespace. + * Provide separate mswin_logging module. * Install more modules into setup.exe: hmac (for ecdsa). * NSIS script: empty installation destination before installing new files into $INSTDIR. * Allow appname based mini icons on About... windows. - * Explicitly add pyhoca.mswin to setup.py if building on MS Windows. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca-gui b/pyhoca-gui index 2082daf..c45acca 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -24,7 +24,7 @@ import sys PROG_NAME = "PyHoca-GUI" try: - from pyhoca.mswin.mswin_logging import setup_mswinlog + from pyhoca.wxgui.mswin_logging import setup_mswinlog setup_mswinlog(PROG_NAME) except ImportError: pass diff --git a/pyhoca/mswin/__init__.py b/pyhoca/mswin/__init__.py deleted file mode 100644 index f04d824..0000000 --- a/pyhoca/mswin/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep@lindix.nl> -# -# PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# PyHoca GUI is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 89a1d1f..97a7a07 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -19,6 +19,3 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. __VERSION__ = '0.5.0.0' - -from frontend import * -from launcher import * \ No newline at end of file diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index 8dcb8f8..af703e9 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -49,7 +49,8 @@ from x2go import CURRENT_LOCAL_USER from x2go import BACKENDS from x2go import X2GoLogger -from pyhoca.wxgui import PyHocaGUI, __VERSION__ +from pyhoca.wxgui import __VERSION__ +from frontend import PyHocaGUI from messages import PyHoca_MessageWindow_Ok import defaults diff --git a/pyhoca/mswin/mswin_logging.py b/pyhoca/wxgui/mswin_logging.py similarity index 100% rename from pyhoca/mswin/mswin_logging.py rename to pyhoca/wxgui/mswin_logging.py diff --git a/setup.py b/setup.py index 9ab5b58..a12cdfb 100755 --- a/setup.py +++ b/setup.py @@ -296,10 +296,8 @@ if platform.system() == 'Windows': } } cmd_options.update({ 'build_exe': cmd_options['build_with_{freezer}'.format(freezer=default_win32exe_freezer)] }) - packages = [ 'pyhoca.wxgui', 'pyhoca.mswin', ] else: cmd_options={} - packages = [ 'pyhoca.wxgui', ] if __name__ == "__main__": @@ -311,7 +309,7 @@ if __name__ == "__main__": author = AUTHOR, url = URL, namespace_packages = [ 'pyhoca', ], - packages = packages, + packages = [ 'pyhoca.wxgui', ], package_dir = {'': '.'}, install_requires = [ 'setuptools', ], cmdclass = cmd_class, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git