diff options
| author | Georg Brandl <georg@python.org> | 2014-10-12 14:13:38 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-12 14:13:38 (GMT) |
| commit | 7728fe8e87f11354de72df34d294106894e87de1 (patch) | |
| tree | 29529934641e87f7bb1685282122c19bcee6eba1 /Doc/library/urllib.parse.rst | |
| parent | bca45ed0c8c25396531ff0645626c9a48801be5a (diff) | |
| parent | 62b08136d759e0da4b9a7fa6189ce1059d7b5150 (diff) | |
| download | cpython-7728fe8e87f11354de72df34d294106894e87de1.zip cpython-7728fe8e87f11354de72df34d294106894e87de1.tar.gz cpython-7728fe8e87f11354de72df34d294106894e87de1.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/library/urllib.parse.rst')
| -rw-r--r-- | Doc/library/urllib.parse.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index 3675305..2c3a0b9 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -81,7 +81,8 @@ or on combining URL components into a URL string. this argument is the empty string. If the *allow_fragments* argument is false, fragment identifiers are not - allowed. The default value for this argument is :const:`True`. + recognized and parsed as part of the preceding component. The default value + for this argument is :const:`True`. The return value is actually an instance of a subclass of :class:`tuple`. This class has the following additional read-only convenience attributes: |