summaryrefslogtreecommitdiffstats
path: root/Lib/posixpath.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-04-16 09:29:17 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-04-16 09:29:17 (GMT)
commit8b04a945eff25ee66746d717b060c1b7844808c9 (patch)
tree6a15965fd3f852d9822a98bd04ef01feda33ccb8 /Lib/posixpath.py
parentd3aeb9b797a6a122c27be5649cbc25e26857109b (diff)
parent119e502277d104286620806ef130e3c0d4f439f0 (diff)
downloadcpython-8b04a945eff25ee66746d717b060c1b7844808c9.zip
cpython-8b04a945eff25ee66746d717b060c1b7844808c9.tar.gz
cpython-8b04a945eff25ee66746d717b060c1b7844808c9.tar.bz2
Merge typo fixes from 3.5
Diffstat (limited to 'Lib/posixpath.py')
-rw-r--r--Lib/posixpath.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 09b8897..7bb4d59 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -372,7 +372,7 @@ symbolic links encountered in the path."""
path, ok = _joinrealpath(filename[:0], filename, {})
return abspath(path)
-# Join two paths, normalizing ang eliminating any symbolic links
+# Join two paths, normalizing and eliminating any symbolic links
# encountered in the second path.
def _joinrealpath(path, rest, seen):
if isinstance(path, bytes):