diff options
author | Guido van Rossum <guido@python.org> | 2016-05-19 20:00:21 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2016-05-19 20:00:21 (GMT) |
commit | 3d4d01f614d894327bbdc1feadebd50b2d3621ff (patch) | |
tree | fda99c3acd7a179cd4f492f765ccfeaa0fea9cd7 /Lib | |
parent | 2a86122759f629a26dbfbc8258fc82c56c613429 (diff) | |
download | cpython-3d4d01f614d894327bbdc1feadebd50b2d3621ff.zip cpython-3d4d01f614d894327bbdc1feadebd50b2d3621ff.tar.gz cpython-3d4d01f614d894327bbdc1feadebd50b2d3621ff.tar.bz2 |
Back out 7e9605697dfc, 2e3c31ab586a, 759b2cecc289.
These added a path attribute to pathlib.Path objects, and docs.
Instead, we're going to use PEP 519.
(Starting in the 3.4 branch and merging forward from there since that's what I did originally.)
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/pathlib.py | 7 | ||||
-rw-r--r-- | Lib/test/test_pathlib.py | 27 |
2 files changed, 0 insertions, 34 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py index 8fef259..4fa872d 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -648,13 +648,6 @@ class PurePath(object): self._parts) or '.' return self._str - @property - def path(self): - try: - return self._str - except AttributeError: - return str(self) - def as_posix(self): """Return the string representation of the path with forward (/) slashes.""" diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 6b3c70d..0d98f24 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -480,22 +480,6 @@ class _BasePurePathTest(object): self.assertEqual(P('a/b.py').name, 'b.py') self.assertEqual(P('/a/b.py').name, 'b.py') - def test_path_common(self): - P = self.cls - def check(arg, expected=None): - if expected is None: - expected = arg - self.assertEqual(P(arg).path, expected.replace('/', self.sep)) - check('', '.') - check('.') - check('/') - check('a/b') - check('/a/b') - check('/a/b/', '/a/b') - check('/a/b/.', '/a/b') - check('a/b.py') - check('/a/b.py') - def test_suffix_common(self): P = self.cls self.assertEqual(P('').suffix, '') @@ -919,17 +903,6 @@ class PureWindowsPathTest(_BasePurePathTest, unittest.TestCase): self.assertEqual(P('//My.py/Share.php').name, '') self.assertEqual(P('//My.py/Share.php/a/b').name, 'b') - def test_path(self): - P = self.cls - self.assertEqual(P('c:').path, 'c:') - self.assertEqual(P('c:/').path, 'c:\\') - self.assertEqual(P('c:a/b').path, 'c:a\\b') - self.assertEqual(P('c:/a/b').path, 'c:\\a\\b') - self.assertEqual(P('c:a/b.py').path, 'c:a\\b.py') - self.assertEqual(P('c:/a/b.py').path, 'c:\\a\\b.py') - self.assertEqual(P('//My.py/Share.php').path, '\\\\My.py\\Share.php\\') - self.assertEqual(P('//My.py/Share.php/a/b').path, '\\\\My.py\\Share.php\\a\\b') - def test_suffix(self): P = self.cls self.assertEqual(P('c:').suffix, '') |