merge from 3.3

b0ce820b · Senthil Kumaran · d92af0f1 · 600b7350 · b0ce820b
Commit b0ce820b authored Sep 29, 2013 by Senthil Kumaran
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/http/server.py Lib/http/server.py +1 -1

No files found.
--- 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)