Windows fix for popen and unicode_literals + import_project CLI

second fix for glob-related windows bugs

fix for realpath() and windows backslashes

weblate/trans/management/commands/import_project.py

@@ -183,7 +183,7 @@ def get_matching_files(self, repo):
         Returns relative path of matched files.
         '''
         matches = glob(os.path.join(repo, self.filemask))
-        return [f.replace(repo, '').strip('/') for f in matches]
+        return [f.replace(repo, '').replace('\\', '/').strip('/') for f in matches]
 
     def get_matching_subprojects(self, repo):
         '''

weblate/trans/models/subproject.py

@@ -949,10 +949,10 @@ def update_branch(self, request=None, method=None):
 
     def get_mask_matches(self):
         """Returns files matching current mask."""
-        prefix = os.path.join(self.get_path(), '')
+        prefix = os.path.join(self.get_path(), '').replace('\\', '/')
         matches = set()
         for filename in glob(os.path.join(self.get_path(), self.filemask)):
-            path = filename.replace(prefix, '')
+            path = filename.replace('\\', '/').replace(prefix, '')
             code = self.get_lang_code(path)
             if re.match(self.language_regex, code):
                 matches.add(path)

weblate/trans/scripts.py

@@ -68,14 +68,14 @@ def run_hook(component, translation, script, *args):
             target = component.linked_subproject
         else:
             target = component
-        environment['WL_VCS'] = target.vcs
-        environment['WL_REPO'] = target.repo
-        environment['WL_PATH'] = target.get_path()
-        environment['WL_FILEMASK'] = component.filemask
-        environment['WL_TEMPLATE'] = component.template
-        environment['WL_FILE_FORMAT'] = component.file_format
+        environment[str('WL_VCS')] = str(target.vcs)
+        environment[str('WL_REPO')] = str(target.repo)
+        environment[str('WL_PATH')] = str(target.get_path())
+        environment[str('WL_FILEMASK')] = str(component.filemask)
+        environment[str('WL_TEMPLATE')] = str(component.template)
+        environment[str('WL_FILE_FORMAT')] = str(component.file_format)
         if translation:
-            environment['WL_LANGUAGE'] = translation.language_code
+            environment[str('WL_LANGUAGE')] = str(translation.language_code)
         try:
             subprocess.check_call(
                 command,

weblate/trans/util.py

@@ -203,15 +203,15 @@ def get_clean_env(extra=None):
     Returns cleaned up environment for subprocess execution.
     """
     environ = {
-        'LANG': 'en_US.UTF-8',
-        'HOME': data_dir('home'),
+        str('LANG'): str('en_US.UTF-8'),
+        str('HOME'): str(data_dir('home')),
     }
     if extra is not None:
         environ.update(extra)
     variables = ('PATH', 'LD_LIBRARY_PATH')
     for var in variables:
         if var in os.environ:
-            environ[var] = os.environ[var]
+            environ[str(var)] = str(os.environ[var])
     return environ
 
 

weblate/trans/vcs.py

@@ -130,8 +130,8 @@ def resolve_symlinks(self, path):
         Resolves any symlinks in the path.
         """
         # Resolve symlinks first
-        real_path = os.path.realpath(os.path.join(self.path, path))
-        repository_path = os.path.realpath(self.path)
+        real_path = os.path.realpath(os.path.join(self.path, path)).replace('\\', '/')
+        repository_path = os.path.realpath(self.path).replace('\\', '/')
 
         if not real_path.startswith(repository_path):
             raise ValueError('Too many symlinks or link outside tree')
@@ -149,7 +149,7 @@ def _popen(cls, args, cwd=None):
         process = subprocess.Popen(
             args,
             cwd=cwd,
-            env=get_clean_env({'GIT_SSH': ssh_file(SSH_WRAPPER)}),
+            env=get_clean_env({str('GIT_SSH'): str(ssh_file(SSH_WRAPPER))}),
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )