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

[yury.selivanov]

https://hg.python.org/cpython/rev/c1bcb0534ba0
changeset:   97456:c1bcb0534ba0
parent:      97454:f5c40ab9e233
parent:      97455:b5b46f796964
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Aug 19 09:53:41 2015 -0400
summary:
  Merge 3.5

files:
  Doc/library/os.path.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -92,11 +92,11 @@
 
       ::
 
-        >>> os.path.commonprefix(['/dir1/dir2', '/dir3/dir4'])
-        '/dir'
+        >>> os.path.commonprefix(['/usr/lib', '/usr/local/lib'])
+        '/usr/l'
 
-        >>> os.path.commonpath(['/dir1/dir2', '/dir3/dir4'])
-        '/'
+        >>> os.path.commonpath(['/usr/lib', '/usr/local/lib'])
+        '/usr'
 
 
 .. function:: dirname(path)

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