diff --git a/picard/util/__init__.py b/picard/util/__init__.py index bc6665f2f..a83d8b9d9 100644 --- a/picard/util/__init__.py +++ b/picard/util/__init__.py @@ -273,7 +273,7 @@ def win_prefix_longpath(path): See https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation """ if len(path) > WIN_MAX_FILEPATH_LEN and not path.startswith(WIN_LONGPATH_PREFIX): - if path.startswith('\\\\'): # UNC path + if path.startswith(r'\\'): # UNC path path = WIN_LONGPATH_PREFIX + 'UNC' + path[1:] else: path = WIN_LONGPATH_PREFIX + path diff --git a/test/test_utils.py b/test/test_utils.py index 2581cce3f..da1dd7313 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -786,32 +786,32 @@ class NormpathTest(PicardTestCase): @unittest.skipUnless(IS_WIN, "windows test") def test_normpath_windows(self): - self.assertEqual('C:\\Foo\\Bar.baz', normpath('C:/Foo/Bar.baz')) - self.assertEqual('C:\\Bar.baz', normpath('C:/Foo/../Bar.baz')) + self.assertEqual(r'C:\Foo\Bar.baz', normpath('C:/Foo/Bar.baz')) + self.assertEqual(r'C:\Bar.baz', normpath('C:/Foo/../Bar.baz')) @unittest.skipUnless(IS_WIN, "windows test") @patch.object(util, 'system_supports_long_paths') def test_normpath_windows_longpath(self, mock_system_supports_long_paths): mock_system_supports_long_paths.return_value = False - path = 'C:\\foo\\' + (252 * 'a') + path = rf'C:\foo\{252 * "a"}' self.assertEqual(path, normpath(path)) path += 'a' - self.assertEqual('\\\\?\\' + path, normpath(path)) + self.assertEqual(rf'\\?\{path}', normpath(path)) class WinPrefixLongpathTest(PicardTestCase): def test_win_prefix_longpath_is_long(self): - path = 'C:\\foo\\' + (253 * 'a') - self.assertEqual('\\\\?\\' + path, win_prefix_longpath(path)) + path = rf'C:\foo\{253 * "a"}' + self.assertEqual(rf'\\?\{path}', win_prefix_longpath(path)) def test_win_prefix_longpath_is_short(self): - path = 'C:\\foo\\' + (252 * 'a') + path = rf'C:\foo\{252 * "a"}' self.assertEqual(path, win_prefix_longpath(path)) def test_win_prefix_longpath_unc(self): - path = '\\\\server\\' + (251 * 'a') - self.assertEqual('\\\\?\\UNC' + path[1:], win_prefix_longpath(path)) + path = rf'\\server\{251 * "a"}' + self.assertEqual(rf'\\?\UNC{path[1:]}', win_prefix_longpath(path)) class StrxfrmTest(PicardTestCase):