Changeset 73930

Timestamp:

Jan 12, 2019, 2:06:55 AM (6 years ago)

Author:

martinl

Message:

wingrass77 core python3 issues, see #3723

Location:

grass/trunk

Files:

• gui/wxpython/core/gcmd.py (modified) (2 diffs)
• gui/wxpython/core/globalvar.py (modified) (1 diff)
• gui/wxpython/core/utils.py (modified) (3 diffs)
• lib/python/script/core.py (modified) (3 diffs)

grass/trunk/gui/wxpython/core/gcmd.py

@@ -48 +48 @@
     import fcntl
 
+from core.debug import Debug
+from core.globalvar import SCT_EXT, _
+
 from grass.script import core as grass
-from core import globalvar
-from core.debug import Debug
 from grass.script.utils import decode
 
-# cannot import from the core.utils module to avoid cross dependencies
-try:
-    # intended to be used also outside this module
-    import gettext
-    _ = gettext.translation(
-        'grasswxpy',
-        os.path.join(
-            os.getenv("GISBASE"),
-            'locale')).ugettext
-except IOError:
-    # using no translation silently
-    def null_gettext(string):
-        return string
-    _ = null_gettext
 
 if sys.version_info.major == 2:
@@ -587 +574 @@
         args = self.cmd
         if sys.platform == 'win32':
-            if os.path.splitext(args[0])[1] == globalvar.SCT_EXT:
+            if os.path.splitext(args[0])[1] == SCT_EXT:
                 args[0] = args[0][:-3]
             # using Python executable to run the module if it is a script

grass/trunk/gui/wxpython/core/globalvar.py

@@ -31 +31 @@
 from core.debug import Debug
 
-# cannot import from the core.utils module to avoid cross dependencies
 try:
     # intended to be used also outside this module
     import gettext
-    _ = gettext.translation(
-        'grasswxpy',
-        os.path.join(
-            os.getenv("GISBASE"),
-            'locale')).ugettext
+    trans = gettext.translation('grasswxpy',
+                                os.path.join(os.getenv("GISBASE"),
+                                                       'locale')
+    )
+    _ = trans.gettext if sys.version_info.major >=3 else trans.ugettext
 except IOError:
     # using no translation silently

grass/trunk/gui/wxpython/core/utils.py

@@ -27 +27 @@
 from grass.exceptions import OpenError
 
-from core import globalvar
 from core.gcmd import RunCommand
 from core.debug import Debug
-
-try:
-    # intended to be used also outside this module
-    import gettext
-    _ = gettext.translation(
-        'grasswxpy',
-        os.path.join(
-            os.getenv("GISBASE"),
-            'locale')).ugettext
-except IOError:
-    # using no translation silently
-    def null_gettext(string):
-        return string
-    _ = null_gettext
-
+from core.globalvar import ETCDIR, wxPythonPhoenix, _
 
 def cmp(a, b):
@@ -841 +826 @@
     """
     try:
-        verFd = open(os.path.join(globalvar.ETCDIR, "VERSIONNUMBER"))
+        verFd = open(os.path.join(ETCDIR, "VERSIONNUMBER"))
         version = int(verFd.readlines()[0].split(' ')[0].split('.')[0])
     except (IOError, ValueError, TypeError, IndexError) as e:
@@ -1098 +1083 @@
                 "tostring"))
         # Create layer and insert alpha values.
-        if globalvar.wxPythonPhoenix:
+        if wxPythonPhoenix:
             wxImage.SetAlpha(fn()[3::4])
         else:

grass/trunk/lib/python/script/core.py

@@ -73 +73 @@
                 kwargs['shell'] = True
                 args = [self._escape_for_shell(arg) for arg in args]
+            args = [decode(arg) for arg in args]
         subprocess.Popen.__init__(self, args, **kwargs)
 
@@ -209 +210 @@
             path.insert(0, os.curdir)
 
-        # PATHEXT is necessary to check on Windows.
-        pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
-        map(lambda x: x.lower(), pathext) # force lowercase
-        if '.py' not in pathext:          # we assume that PATHEXT contains always '.py'
-            pathext.insert(0, '.py')
+        # PATHEXT is necessary to check on Windows (force lowercase)
+        pathext = list(map(lambda x: encode(x.lower()),
+                           os.environ.get("PATHEXT", "").split(os.pathsep)))
+        if b'.py' not in pathext:
+            # we assume that PATHEXT contains always '.py'
+            pathext.insert(0, b'.py')
         # See if the given file matches any of the expected path extensions.
         # This will allow us to short circuit when given "python.exe".
         # If it does match, only test that one, otherwise we have to try
         # others.
-        if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
+        if any(cmd.lower().endswith(ext) for ext in pathext):
             files = [cmd]
         else:
@@ -233 +235 @@
             seen.add(normdir)
             for thefile in files:
-                name = os.path.join(dir, thefile)
+                name = os.path.join(encode(dir), thefile)
                 if _access_check(name, mode):
                     return name