[Python-checkins] cpython (merge 3.3 -> default): merge from 3.3

[senthil.kumaran]

http://hg.python.org/cpython/rev/220b34cbd711
changeset:   85879:220b34cbd711
parent:      85876:067159ee704f
parent:      85878:e27148c51f05
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Sep 29 18:59:27 2013 -0700
summary:
  merge from 3.3

files:
  Lib/http/server.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -789,7 +789,7 @@
         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)

-- 
Repository URL: http://hg.python.org/cpython