summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-07 11:01:47 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-10-07 11:01:47 (GMT)
commit3f930dcd8725078c1655f09ca9bea0889e999fd6 (patch)
tree3b4079f251261009de434a8a42904a1438b50b94 /Lib/http
parent397625e43280c1dec19af59c53704e0d95b557d5 (diff)
parent9955a373a8ae5a3ac9108afc436199277fdedff7 (diff)
downloadcpython-3f930dcd8725078c1655f09ca9bea0889e999fd6.zip
cpython-3f930dcd8725078c1655f09ca9bea0889e999fd6.tar.gz
cpython-3f930dcd8725078c1655f09ca9bea0889e999fd6.tar.bz2
Merge typo fixes from 3.4 into 3.5
Diffstat (limited to 'Lib/http')
-rw-r--r--Lib/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index fde2f14..e1b71ab 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -831,7 +831,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
def _url_collapse_path(path):
"""
Given a URL path, remove extra '/'s and '.' path elements and collapse
- any '..' references and returns a colllapsed path.
+ any '..' references and returns a collapsed path.
Implements something akin to RFC-2396 5.2 step 6 to parse relative paths.
The utility of this function is limited to is_cgi method and helps