summaryrefslogtreecommitdiffstats
path: root/Lib/http/server.py
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2013-09-30 01:59:27 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2013-09-30 01:59:27 (GMT)
commitb0ce820bb3490afb2c87102e320f42510fffb0a4 (patch)
tree51be51be10d5c77e61d0bd1883f5f1591cddb0d5 /Lib/http/server.py
parentd92af0f1d9087c3526ac470dafec1449404e40f9 (diff)
parent600b735062d2eb57ac9ec5c5e1e860c9af7371d4 (diff)
downloadcpython-b0ce820bb3490afb2c87102e320f42510fffb0a4.zip
cpython-b0ce820bb3490afb2c87102e320f42510fffb0a4.tar.gz
cpython-b0ce820bb3490afb2c87102e320f42510fffb0a4.tar.bz2
merge from 3.3
Diffstat (limited to 'Lib/http/server.py')
-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 2ddef52..4b249de 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -789,7 +789,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
path = path.split('?',1)[0]
path = path.split('#',1)[0]
# Don't forget explicit trailing slash when normalizing. Issue17324
- trailing_slash = True if path.rstrip().endswith('/') else False
+ trailing_slash = path.rstrip().endswith('/')
path = posixpath.normpath(urllib.parse.unquote(path))
words = path.split('/')
words = filter(None, words)