summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-07 11:13:55 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-10-07 11:13:55 (GMT)
commit585a6acfef1a03955bc2561aab7b2acfbb6bb2d4 (patch)
treecd3684ef639760f403da82b1448786ebd9c8379d /Lib/http
parent6568714366e8c7c7222681a5ddcc13c57b7495a2 (diff)
parentec1aa5c2a1d0848351dd9d7d2758c553f18e56b2 (diff)
downloadcpython-585a6acfef1a03955bc2561aab7b2acfbb6bb2d4.zip
cpython-585a6acfef1a03955bc2561aab7b2acfbb6bb2d4.tar.gz
cpython-585a6acfef1a03955bc2561aab7b2acfbb6bb2d4.tar.bz2
Merge typo fixes from 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