[Python-checkins] cpython (merge 3.3 -> default): merge from 3.3. Minor urllib.parse.rst docs fix.

[senthil.kumaran]

http://hg.python.org/cpython/rev/7ccc64db4abe
changeset:   85908:7ccc64db4abe
parent:      85894:8e180b2067e4
parent:      85907:0e204fbb0b08
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Sep 30 22:12:51 2013 -0700
summary:
  merge from 3.3. Minor urllib.parse.rst docs fix.

files:
  Doc/library/urllib.parse.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -70,7 +70,7 @@
        ParseResult(scheme='', netloc='www.cwi.nl:80', path='/%7Eguido/Python.html',
                   params='', query='', fragment='')
        >>> urlparse('www.cwi.nl/%7Eguido/Python.html')
-       ParseResult(scheme='', netloc='', path='www.cwi.nl:80/%7Eguido/Python.html',
+       ParseResult(scheme='', netloc='', path='www.cwi.nl/%7Eguido/Python.html',
                   params='', query='', fragment='')
        >>> urlparse('help/Python.html')
        ParseResult(scheme='', netloc='', path='help/Python.html', params='',

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