[X2Go-Commits] [pyhoca-gui] 16/18: rename occurrences of win32 to mswin

git-admin at x2go.org git-admin at x2go.org
Fri Feb 7 13:26:26 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch brokerclient
in repository pyhoca-gui.

commit f5f5d06cdb4216d2d91c6a7453fe501472f9a320
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 7 12:00:16 2014 +0100

    rename occurrences of win32 to mswin
---
 debian/changelog                                   |    2 +-
 pyhoca-gui                                         |    4 ++--
 .../mswin/{win32_logging.py => mswin_logging.py}   |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3072169..3362e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ 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_win32log to a separate module namespace.
+  * Move setup_mswinlog to a separate module namespace.
   * Install more modules into setup.exe: hmac (for ecdsa).
   * NSIS script: empty installation destination before installing new files
     into $INSTDIR.
diff --git a/pyhoca-gui b/pyhoca-gui
index bbd2b48..6cba20a 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -24,8 +24,8 @@ import sys
 
 PROG_NAME = "PyHoca-GUI"
 try:
-    from pyhoca.mswin.win32_logging import setup_win32log
-    setup_win32log(PROG_NAME)
+    from pyhoca.mswin.mswin_logging import setup_mswinlog
+    setup_mswinlog(PROG_NAME)
 except ImportError:
     pass
 
diff --git a/pyhoca/mswin/win32_logging.py b/pyhoca/mswin/mswin_logging.py
similarity index 91%
rename from pyhoca/mswin/win32_logging.py
rename to pyhoca/mswin/mswin_logging.py
index b1be3ad..d0879ff 100644
--- a/pyhoca/mswin/win32_logging.py
+++ b/pyhoca/mswin/mswin_logging.py
@@ -21,9 +21,9 @@
 import sys
 import os
 
-def setup_win32log(PROG_NAME):
+def setup_mswinlog(PROG_NAME):
     if hasattr(sys, 'frozen') and str(sys.frozen) in ("windows_exe", "console_exe", "1", ):
-        class Win32_Logging(object):
+        class MsWin_Logging(object):
 
             softspace = 0
             _fname = os.path.join(os.environ['AppData'], PROG_NAME, '%s.log' % PROG_NAME)
@@ -52,7 +52,7 @@ def setup_win32log(PROG_NAME):
                 if self._file is not None:
                     self._file.flush()
 
-        sys.stdout = Win32_Logging(filemode='w+')
-        sys.stderr = Win32_Logging(filemode='a')
-        del Win32_Logging
+        sys.stdout = MSWin_Logging(filemode='w+')
+        sys.stderr = MSWin_Logging(filemode='a')
+        del MSWin_Logging
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git



More information about the x2go-commits mailing list