From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 5 May 2014 21:09:33 +0000 (+0100)
Subject: Revert [603f5eba32c98d4bfbc354530dcd36dfcd58887a] which was applied unintentionally.
X-Git-Tag: allmydata-tahoe-1.10.1a1~184
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/flags/?a=commitdiff_plain;h=c85060c436834b58cf7f1876811762d53c81ff90;p=tahoe-lafs%2Ftahoe-lafs.git

Revert [603f5eba32c98d4bfbc354530dcd36dfcd58887a] which was applied unintentionally.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py
index feca0d2f..7039ebb8 100644
--- a/src/allmydata/test/test_cli.py
+++ b/src/allmydata/test/test_cli.py
@@ -3744,7 +3744,7 @@ class Webopen(GridTestMixin, CLITestMixin, unittest.TestCase):
             raise
         return d
 
-class Options(ReallyEqualMixin, unittest.TestCase):
+class Options(unittest.TestCase):
     # this test case only looks at argument-processing and simple stuff.
 
     def parse(self, args, stdout=None):
@@ -3826,14 +3826,14 @@ class Options(ReallyEqualMixin, unittest.TestCase):
         # option after, or a basedir argument after, but none in the wrong
         # place, and not more than one of the three.
         o = self.parse(["start"])
-        self.failUnlessReallyEqual(o["basedir"], os.path.join(fileutil.abspath_expanduser_unicode(u"~"),
-                                                              u".tahoe"))
+        self.failUnlessEqual(o["basedir"], os.path.join(os.path.expanduser("~"),
+                                                        ".tahoe"))
         o = self.parse(["start", "here"])
-        self.failUnlessReallyEqual(o["basedir"], fileutil.abspath_expanduser_unicode(u"here"))
+        self.failUnlessEqual(o["basedir"], os.path.abspath("here"))
         o = self.parse(["start", "--basedir", "there"])
-        self.failUnlessReallyEqual(o["basedir"], fileutil.abspath_expanduser_unicode(u"there"))
+        self.failUnlessEqual(o["basedir"], os.path.abspath("there"))
         o = self.parse(["--node-directory", "there", "start"])
-        self.failUnlessReallyEqual(o["basedir"], fileutil.abspath_expanduser_unicode(u"there"))
+        self.failUnlessEqual(o["basedir"], os.path.abspath("there"))
 
         self.failUnlessRaises(usage.UsageError, self.parse,
                               ["--basedir", "there", "start"])
diff --git a/src/allmydata/test/test_client.py b/src/allmydata/test/test_client.py
index 4a9fa5d4..796971b2 100644
--- a/src/allmydata/test/test_client.py
+++ b/src/allmydata/test/test_client.py
@@ -1,4 +1,4 @@
-import os, sys
+import os
 from twisted.trial import unittest
 from twisted.application import service
 
@@ -45,11 +45,10 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
         fileutil.write(os.path.join(basedir, "debug_discard_storage"), "")
 
         e = self.failUnlessRaises(OldConfigError, client.Client, basedir)
-        abs_basedir = fileutil.abspath_expanduser_unicode(unicode(basedir)).encode(sys.getfilesystemencoding())
-        self.failUnlessIn(os.path.join(abs_basedir, "introducer.furl"), e.args[0])
-        self.failUnlessIn(os.path.join(abs_basedir, "no_storage"), e.args[0])
-        self.failUnlessIn(os.path.join(abs_basedir, "readonly_storage"), e.args[0])
-        self.failUnlessIn(os.path.join(abs_basedir, "debug_discard_storage"), e.args[0])
+        self.failUnlessIn(os.path.abspath(os.path.join(basedir, "introducer.furl")), e.args[0])
+        self.failUnlessIn(os.path.abspath(os.path.join(basedir, "no_storage")), e.args[0])
+        self.failUnlessIn(os.path.abspath(os.path.join(basedir, "readonly_storage")), e.args[0])
+        self.failUnlessIn(os.path.abspath(os.path.join(basedir, "debug_discard_storage")), e.args[0])
 
         for oldfile in ['introducer.furl', 'no_storage', 'readonly_storage',
                         'debug_discard_storage']:
diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index e45d7ef1..b527771d 100644
--- a/src/allmydata/test/test_util.py
+++ b/src/allmydata/test/test_util.py
@@ -488,10 +488,7 @@ class FileUtil(unittest.TestCase):
         abspath_cwd = fileutil.abspath_expanduser_unicode(u".")
         self.failUnless(isinstance(saved_cwd, unicode), saved_cwd)
         self.failUnless(isinstance(abspath_cwd, unicode), abspath_cwd)
-        if sys.platform == "win32":
-            self.failUnlessEqual(abspath_cwd, u"\\\\?\\" + saved_cwd)
-        else:
-            self.failUnlessEqual(abspath_cwd, saved_cwd)
+        self.failUnlessEqual(abspath_cwd, saved_cwd)
 
         # adapted from <http://svn.python.org/view/python/branches/release26-maint/Lib/test/test_posixpath.py?view=markup&pathrev=78279#test_abspath>
 
diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py
index 87650848..8eb8e9fb 100644
--- a/src/allmydata/util/fileutil.py
+++ b/src/allmydata/util/fileutil.py
@@ -311,12 +311,7 @@ def abspath_expanduser_unicode(path):
 
     # We won't hit <http://bugs.python.org/issue5827> because
     # there is always at least one Unicode path component.
-    path = os.path.normpath(path)
-
-    if sys.platform == "win32" and not path.startswith(u"\\\\"):
-        path = u"\\\\?\\" + path
-
-    return path
+    return os.path.normpath(path)
 
 
 have_GetDiskFreeSpaceExW = False