Merge pull request #142 from AntoineD/master

fix issue #139
tomerfiliba · Aug 7, 2014 · b2be5a2 · b2be5a2
2 parents ceb240e + 88d4e3c
commit b2be5a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/plumbum/path/local.py b/plumbum/path/local.py
@@ -41,7 +41,9 @@ def __init__(self, *parts):
             raise TypeError("LocalPath cannot be constructed from %r" % (parts,))
         self._path = os.path.normpath(os.path.join(*(str(p) for p in parts)))
     def __new__(cls, *parts):
-        if len(parts) == 1 and isinstance(parts[0], cls):
+        if len(parts) == 1 and \
+                isinstance(parts[0], cls) and \
+                not isinstance(parts[0], LocalWorkdir):
             return parts[0]
         return object.__new__(cls)
     def __str__(self):

diff --git a/tests/test_local.py b/tests/test_local.py
@@ -417,7 +417,8 @@ def test_nesting_lists_as_argv(self):
     def test_contains(self):
         self.assertTrue("ls" in local, "Expected to find `ls`")
 
-
+    def test_issue_139(self):
+        LocalPath(local.cwd)
 
 if __name__ == "__main__":
     unittest.main()