Better glob mapping.

Author: DailyDreaming

test/test_client_util.py

@@ -20,11 +20,19 @@ def tearDown(self):
 
     def test_expand_globs(self):
         """Asserts that wes_client.expand_globs() sees the same files in the cwd as 'ls'."""
-        files = subprocess.check_output(['ls', '-1', '.']).decode('utf-8').split('\n')
+        files = subprocess.check_output(['ls', '-1', '.'])
+
+        # python 2/3 bytestring/utf-8 compatibility
+        if isinstance(files, str):
+            files = files.split('\n')
+        else:
+            files = files.decode('utf-8').split('\n')
+
         if '' in files:
             files.remove('')
+        files = ['file://' + os.path.abspath(f) for f in files]
         glob_files = expand_globs('*')
-        assert set(files) == glob_files
+        assert set(files) == glob_files, '\n' + str(set(files)) + '\n' + str(glob_files)
 
 
 if __name__ == '__main__':

wes_client/util.py

@@ -94,7 +94,14 @@ def fixpaths(d):
 def expand_globs(attachments):
     expanded_list = []
     for filepath in attachments:
-        expanded_list += glob.glob(filepath)
+        if 'file://' in filepath:
+            for f in glob.glob(filepath[7:]):
+                expanded_list += ['file://' + os.path.abspath(f)]
+        elif ':' not in filepath:
+            for f in glob.glob(filepath):
+                expanded_list += ['file://' + os.path.abspath(f)]
+        else:
+            expanded_list += [filepath]
     return set(expanded_list)