Fixed problematic guidata compatibility issue between v1.5 and v1.6

PierreRaybaut · PierreRaybaut · commit 601dea4733bb · 2013-01-30T09:57:40.000+01:00
diff --git a/make.py b/make.py
@@ -19,7 +19,7 @@
 import shutil
 import sys
 
-from guidata import disthelpers
+from guidata.disthelpers import get_msvc_dlls
 
 # Local imports
 from winpython import wppm, utils
@@ -374,9 +374,8 @@ def _extract_python(self):
     def _add_msvc_files(self):
         """Adding Microsoft Visual C++ DLLs"""
         print("Adding Microsoft Visual C++ DLLs""")
-        for fname in disthelpers.get_msvc_dlls(
-                                architecture=self.distribution.architecture,
-                                python_version=self.distribution.version):
+        for fname in get_msvc_dlls(architecture=self.distribution.architecture,
+                                   python_version=self.distribution.version):
             shutil.copy(fname, self.python_dir)
 
     def _install_required_packages(self):
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -23,8 +23,7 @@
 import atexit
 import sys
 import stat
-
-from guidata.utils import decode_fs_string
+import locale
 
 
 # Development only
@@ -137,6 +136,13 @@ def is_python_distribution(path):
            and osp.isdir(osp.join(path, 'Lib', 'site-packages'))
 
 
+def decode_fs_string(string):
+    """Convert string from file system charset to unicode"""
+    charset = sys.getfilesystemencoding()
+    if charset is None:
+        charset = locale.getpreferredencoding()
+    return string.decode(charset)
+
 def exec_shell_cmd(args, path):
     """Execute shell command (*args* is a list of arguments) in *path*"""
     #print " ".join(args)
