Test posix_only argument for portable_filename

    * Test posix_only argument for safe_path

Signed-off-by: Jono Yang <[email protected]>

src/commoncode/paths.py

@@ -140,25 +140,33 @@ def resolve(path, posix=True):
     return path
 
 
-legal_punctuation = r"!\#$%&\(\)\+,\-\.;\=@\[\]_\{\}\~"
-legal_spaces = r" "
-legal_chars = r'A-Za-z0-9' + legal_punctuation
+legal_punctuation = r'!\#$%&\(\)\+,\-\.;\=@\[\]_\{\}\~'
+legal_spaces = r' '
+legal_alphanumeric = r'A-Za-z0-9'
+legal_chars = legal_alphanumeric + legal_punctuation
 legal_chars_inc_spaces = legal_chars + legal_spaces
 illegal_chars_re = r'[^' + legal_chars + r']'
 illegal_chars_exc_spaces_re = r'[^' + legal_chars_inc_spaces + r']'
 replace_illegal_chars = re.compile(illegal_chars_re).sub
 replace_illegal_chars_exc_spaces = re.compile(illegal_chars_exc_spaces_re).sub
 
 
-posix_legal_punctuation = r"!@#$%^&\*\(\)-_=\+\[\{\]\}\\\|;:'\",<.>\/\?`~"
-posix_legal_chars = r"A-Za-z0-9" + posix_legal_punctuation
+posix_legal_punctuation = r'<:"/>\|\*\^\\\'`\?' + legal_punctuation
+posix_legal_chars = legal_alphanumeric + posix_legal_punctuation
 posix_legal_chars_inc_spaces = posix_legal_chars + legal_spaces
-posix_illegal_chars_re = r"[^" + posix_legal_chars + r"]"
-posix_illegal_chars_exc_spaces_re = r"[^" + posix_legal_chars_inc_spaces + r"]"
+posix_illegal_chars_re = r'[^' + posix_legal_chars + r']'
+posix_illegal_chars_exc_spaces_re = r'[^' + posix_legal_chars_inc_spaces + r']'
 replace_illegal_posix_chars = re.compile(posix_illegal_chars_re).sub
 replace_illegal_posix_chars_exc_spaces = re.compile(posix_illegal_chars_exc_spaces_re).sub
 
 
+ILLEGAL_WINDOWS_NAMES = set([
+    'com1', 'com2', 'com3', 'com4', 'com5', 'com6', 'com7', 'com8', 'com9',
+    'lpt1', 'lpt2', 'lpt3', 'lpt4', 'lpt5', 'lpt6', 'lpt7', 'lpt8', 'lpt9',
+    'aux', 'con', 'nul', 'prn'
+])
+
+
 def portable_filename(filename, preserve_spaces=False, posix_only=False):
     """
     Return a new name for `filename` that is portable across operating systems.
@@ -197,16 +205,8 @@ def portable_filename(filename, preserve_spaces=False, posix_only=False):
             filename = replace_illegal_chars('_', filename)
 
     if not posix_only:
-        # these are illegal both upper and lowercase and with or without an extension
-        # we insert an underscore after the base name.
-        windows_illegal_names = set([
-            'com1', 'com2', 'com3', 'com4', 'com5', 'com6', 'com7', 'com8', 'com9',
-            'lpt1', 'lpt2', 'lpt3', 'lpt4', 'lpt5', 'lpt6', 'lpt7', 'lpt8', 'lpt9',
-            'aux', 'con', 'nul', 'prn'
-        ])
-
         basename, dot, extension = filename.partition('.')
-        if basename.lower() in windows_illegal_names:
+        if basename.lower() in ILLEGAL_WINDOWS_NAMES:
             filename = ''.join([basename, '_', dot, extension])
 
     # no name made only of dots.

tests/test_paths.py

@@ -93,6 +93,14 @@ def test_safe_path_posix_style_many_dots(self):
         expected = 'dotdot/dotdot/dotdot/webform.components.inc'
         assert test == expected
 
+    def test_safe_path_posix_only(self):
+        test_path = 'var/lib/dpkg/info/libgsm1:amd64.list'
+        test = paths.safe_path(test_path)
+        expected = 'var/lib/dpkg/info/libgsm1_amd64.list'
+        assert test == expected
+        test = paths.safe_path(test_path, posix_only=True)
+        assert test == test_path
+
     def test_resolve_mixed_slash(self):
         test = paths.resolve('C:\\..\\./drupal.js')
         expected = 'C/drupal.js'
@@ -140,6 +148,24 @@ def test_portable_filename(self):
         expected = 'This_contain_UMLAUT_umlauts.txt'
         assert paths.portable_filename(u'This contain UMLAUT \xfcml\xe4uts.txt') == expected
 
+        # Check to see if illegal Windows filenames are properly handled
+        for illegal_window_name in paths.ILLEGAL_WINDOWS_NAMES:
+            # Rename files with names that are illegal on Windows
+            expected = f'{illegal_window_name}_'
+            assert paths.portable_filename(illegal_window_name) == expected
+
+            # Allow files with names that are illegal on Windows
+            assert paths.portable_filename(illegal_window_name, posix_only=True) == illegal_window_name
+
+        # Check to see if the posix_only option does and does not replace
+        # punctuation characters that are illegal in Windows filenames
+        for valid_posix_path_char in paths.posix_legal_punctuation:
+            test_name = f'test{valid_posix_path_char}'
+            assert paths.portable_filename(test_name, posix_only=True) == test_name
+            if valid_posix_path_char not in paths.legal_punctuation:
+                expected = f'test_'
+                assert paths.portable_filename(test_name) == expected
+
 
 class TestCommonPath(TestCase):