From: Daira Hopwood Date: Mon, 28 Dec 2015 20:18:49 +0000 (+0000) Subject: Allow abspath_expanduser_unicode to optionally produce paths without the long-path... X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=c12b3348f595af507022ee933967febafcc5bda9;p=tahoe-lafs%2Ftahoe-lafs.git Allow abspath_expanduser_unicode to optionally produce paths without the long-path prefix on Windows. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index db64bf19..606dc6c5 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -460,12 +460,14 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): saved_cwd = os.path.normpath(os.getcwdu()) abspath_cwd = fileutil.abspath_expanduser_unicode(u".") + abspath_cwd_notlong = fileutil.abspath_expanduser_unicode(u".", long_path=False) self.failUnless(isinstance(saved_cwd, unicode), saved_cwd) self.failUnless(isinstance(abspath_cwd, unicode), abspath_cwd) if sys.platform == "win32": self.failUnlessReallyEqual(abspath_cwd, fileutil.to_windows_long_path(saved_cwd)) else: self.failUnlessReallyEqual(abspath_cwd, saved_cwd) + self.failUnlessReallyEqual(abspath_cwd_notlong, saved_cwd) self.failUnlessReallyEqual(fileutil.to_windows_long_path(u"\\\\?\\foo"), u"\\\\?\\foo") self.failUnlessReallyEqual(fileutil.to_windows_long_path(u"\\\\.\\foo"), u"\\\\.\\foo") @@ -494,7 +496,19 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): self.failUnlessReallyEqual(baz[4], bar[4]) # same drive + baz_notlong = fileutil.abspath_expanduser_unicode(u"\\baz", long_path=False) + self.failIf(baz_notlong.startswith(u"\\\\?\\"), baz_notlong) + self.failUnlessReallyEqual(baz_notlong[1 :], u":\\baz") + + bar_notlong = fileutil.abspath_expanduser_unicode(u"\\bar", base=baz_notlong, long_path=False) + self.failIf(bar_notlong.startswith(u"\\\\?\\"), bar_notlong) + self.failUnlessReallyEqual(bar_notlong[1 :], u":\\bar") + # not u":\\baz\\bar", because \bar is absolute on the current drive. + + self.failUnlessReallyEqual(baz_notlong[0], bar_notlong[0]) # same drive + self.failIfIn(u"~", fileutil.abspath_expanduser_unicode(u"~")) + self.failIfIn(u"~", fileutil.abspath_expanduser_unicode(u"~", long_path=False)) cwds = ['cwd'] try: @@ -510,6 +524,9 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): for upath in (u'', u'fuu', u'f\xf9\xf9', u'/fuu', u'U:\\', u'~'): uabspath = fileutil.abspath_expanduser_unicode(upath) self.failUnless(isinstance(uabspath, unicode), uabspath) + + uabspath_notlong = fileutil.abspath_expanduser_unicode(upath, long_path=False) + self.failUnless(isinstance(uabspath_notlong, unicode), uabspath_notlong) finally: os.chdir(saved_cwd) diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index 152cae0b..5fc35c05 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -279,17 +279,18 @@ try: except ImportError: pass -def abspath_expanduser_unicode(path, base=None): +def abspath_expanduser_unicode(path, base=None, long_path=True): """ Return the absolute version of a path. If 'base' is given and 'path' is relative, the path will be expanded relative to 'base'. 'path' must be a Unicode string. 'base', if given, must be a Unicode string corresponding to an absolute path as returned by a previous call to abspath_expanduser_unicode. + On Windows, the result will be a long path unless long_path is given as False. """ if not isinstance(path, unicode): raise AssertionError("paths must be Unicode strings") - if base is not None: + if base is not None and long_path: precondition_abspath(base) path = expanduser(path) @@ -316,7 +317,7 @@ def abspath_expanduser_unicode(path, base=None): # there is always at least one Unicode path component. path = os.path.normpath(path) - if sys.platform == "win32": + if sys.platform == "win32" and long_path: path = to_windows_long_path(path) return path