]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Fix a corner case for to_filepath on Windows to make it consistent with Unix.
authorDaira Hopwood <daira@jacaranda.org>
Mon, 2 Nov 2015 22:00:31 +0000 (22:00 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 2 Nov 2015 22:00:31 +0000 (22:00 +0000)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/test/test_encodingutil.py
src/allmydata/util/encodingutil.py

index 3650daf81d17a88bef19d9fe4108d045115148bb..49db1d187fe3247e68544fbc44d4d955978554c3 100644 (file)
@@ -447,6 +447,14 @@ class QuotePaths(ReallyEqualMixin, unittest.TestCase):
         self.failUnlessReallyEqual(quote_filepath(foo_bar_fp, quotemarks=False),
                                    win32_other("C:\\foo\\bar", "/foo/bar"))
 
+        foo_longfp = FilePath(u'\\\\?\\C:\\foo')
+        self.failUnlessReallyEqual(quote_filepath(foo_longfp),
+                                   win32_other("'C:\\foo'", "'\\\\?\\C:\\foo'"))
+        self.failUnlessReallyEqual(quote_filepath(foo_longfp, quotemarks=True),
+                                   win32_other("'C:\\foo'", "'\\\\?\\C:\\foo'"))
+        self.failUnlessReallyEqual(quote_filepath(foo_longfp, quotemarks=False),
+                                   win32_other("C:\\foo", "\\\\?\\C:\\foo"))
+
 
 class FilePaths(ReallyEqualMixin, unittest.TestCase):
     def test_to_filepath(self):
index fec92e4c47fab319ebc785df761797afa9a45a90..1015679403ff391ecaeab33abfd1f4a4f761164e 100644 (file)
@@ -274,11 +274,18 @@ def extend_filepath(fp, segments):
         return fp
 
 def to_filepath(path):
-    precondition(isinstance(path, basestring), path=path)
+    precondition(isinstance(path, unicode if use_unicode_filepath else basestring),
+                 path=path)
 
     if isinstance(path, unicode) and not use_unicode_filepath:
         path = path.encode(filesystem_encoding)
 
+    if sys.platform == "win32":
+        _assert(isinstance(path, unicode), path=path)
+        if path.startswith(u"\\\\?\\") and len(path) > 4:
+            # FilePath normally strips trailing path separators, but not in this case.
+            path = path.rstrip(u"\\")
+
     return FilePath(path)
 
 def _decode(s):