[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/f4c5f3857d4b
changeset:   99699:f4c5f3857d4b
parent:      99698:a0f9a8bee85f
parent:      99696:1472c08d9c23
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Dec 29 00:01:31 2015 +0200
summary:
  Merge heads

files:
  Lib/test/test_pathlib.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1437,13 +1437,13 @@
         self.assertEqual(set(p.glob("dirA/../file*")), { P(BASE, "dirA/../fileA") })
         self.assertEqual(set(p.glob("../xyzzy")), set())
 
-    def _check_resolve_relative(self, p, expected):
+
+    def _check_resolve(self, p, expected):
         q = p.resolve()
         self.assertEqual(q, expected)
 
-    def _check_resolve_absolute(self, p, expected):
-        q = p.resolve()
-        self.assertEqual(q, expected)
+    # this can be used to check both relative and absolute resolutions
+    _check_resolve_relative = _check_resolve_absolute = _check_resolve
 
     @with_symlinks
     def test_resolve_common(self):

-- 
Repository URL: https://hg.python.org/cpython