2000-02-04 11:28:42 -04:00
|
|
|
"""Parse (absolute and relative) URLs.
|
|
|
|
|
|
|
|
See RFC 1808: "Relative Uniform Resource Locators", by R. Fielding,
|
|
|
|
UC Irvine, June 1995.
|
|
|
|
"""
|
1994-09-12 07:36:35 -03:00
|
|
|
|
2008-07-07 15:24:11 -03:00
|
|
|
import sys
|
|
|
|
|
2002-10-16 18:21:39 -03:00
|
|
|
__all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
|
|
|
|
"urlsplit", "urlunsplit"]
|
2001-03-01 00:27:19 -04:00
|
|
|
|
1994-09-12 07:36:35 -03:00
|
|
|
# A classification of schemes ('' means apply by default)
|
2004-05-07 02:50:35 -03:00
|
|
|
uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap',
|
2006-01-20 13:24:23 -04:00
|
|
|
'wais', 'file', 'https', 'shttp', 'mms',
|
|
|
|
'prospero', 'rtsp', 'rtspu', '', 'sftp']
|
2004-05-07 02:50:35 -03:00
|
|
|
uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
|
2006-01-20 13:24:23 -04:00
|
|
|
'imap', 'wais', 'file', 'mms', 'https', 'shttp',
|
|
|
|
'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
|
|
|
|
'svn', 'svn+ssh', 'sftp']
|
2004-05-07 02:50:35 -03:00
|
|
|
non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
|
2006-04-21 07:40:58 -03:00
|
|
|
'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
|
2004-05-07 02:50:35 -03:00
|
|
|
uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
|
2006-04-21 07:40:58 -03:00
|
|
|
'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips',
|
2006-01-20 13:24:23 -04:00
|
|
|
'mms', '', 'sftp']
|
2004-05-07 02:50:35 -03:00
|
|
|
uses_query = ['http', 'wais', 'imap', 'https', 'shttp', 'mms',
|
2006-04-21 07:40:58 -03:00
|
|
|
'gopher', 'rtsp', 'rtspu', 'sip', 'sips', '']
|
2004-05-07 02:50:35 -03:00
|
|
|
uses_fragment = ['ftp', 'hdl', 'http', 'gopher', 'news',
|
2006-01-20 13:24:23 -04:00
|
|
|
'nntp', 'wais', 'https', 'shttp', 'snews',
|
|
|
|
'file', 'prospero', '']
|
1994-09-12 07:36:35 -03:00
|
|
|
|
|
|
|
# Characters valid in scheme names
|
2000-12-19 12:48:13 -04:00
|
|
|
scheme_chars = ('abcdefghijklmnopqrstuvwxyz'
|
|
|
|
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
|
|
'0123456789'
|
|
|
|
'+-.')
|
1994-09-12 07:36:35 -03:00
|
|
|
|
1997-07-14 16:08:15 -03:00
|
|
|
MAX_CACHE_SIZE = 20
|
1996-05-28 20:54:24 -03:00
|
|
|
_parse_cache = {}
|
|
|
|
|
|
|
|
def clear_cache():
|
2001-01-14 23:34:38 -04:00
|
|
|
"""Clear the parse cache."""
|
Merged revisions 59921-59932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59923 | raymond.hettinger | 2008-01-11 19:04:55 +0100 (Fri, 11 Jan 2008) | 1 line
Speed-up and simplify code urlparse's result objects.
........
r59924 | andrew.kuchling | 2008-01-11 20:33:24 +0100 (Fri, 11 Jan 2008) | 1 line
Bug #1790: update link; remove outdated paragraph
........
r59925 | thomas.heller | 2008-01-11 20:34:06 +0100 (Fri, 11 Jan 2008) | 5 lines
Raise an error instead of crashing with a segfault when a NULL
function pointer is called.
Will backport to release25-maint.
........
r59927 | thomas.heller | 2008-01-11 21:29:19 +0100 (Fri, 11 Jan 2008) | 4 lines
Fix a potential 'SystemError: NULL result without error'.
NULL may be a valid return value from PyLong_AsVoidPtr.
Will backport to release25-maint.
........
r59928 | raymond.hettinger | 2008-01-12 00:25:18 +0100 (Sat, 12 Jan 2008) | 1 line
Update the opcode docs for STORE_MAP and BUILD_MAP
........
r59929 | mark.dickinson | 2008-01-12 02:56:00 +0100 (Sat, 12 Jan 2008) | 4 lines
Issue 1780: Allow leading and trailing whitespace in Decimal constructor,
when constructing from a string. Disallow trailing newlines in
Context.create_decimal.
........
r59930 | georg.brandl | 2008-01-12 11:53:29 +0100 (Sat, 12 Jan 2008) | 3 lines
Move OSError docs to exceptions doc, remove obsolete descriptions
from os docs, rework posix docs.
........
r59931 | georg.brandl | 2008-01-12 14:47:57 +0100 (Sat, 12 Jan 2008) | 3 lines
Patch #1700288: Method cache optimization, by Armin Rigo, ported to
2.6 by Kevin Jacobs.
........
r59932 | georg.brandl | 2008-01-12 17:11:09 +0100 (Sat, 12 Jan 2008) | 2 lines
Fix editing glitch.
........
2008-01-12 15:39:10 -04:00
|
|
|
_parse_cache.clear()
|
1996-05-28 20:54:24 -03:00
|
|
|
|
|
|
|
|
Merged revisions 59921-59932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59923 | raymond.hettinger | 2008-01-11 19:04:55 +0100 (Fri, 11 Jan 2008) | 1 line
Speed-up and simplify code urlparse's result objects.
........
r59924 | andrew.kuchling | 2008-01-11 20:33:24 +0100 (Fri, 11 Jan 2008) | 1 line
Bug #1790: update link; remove outdated paragraph
........
r59925 | thomas.heller | 2008-01-11 20:34:06 +0100 (Fri, 11 Jan 2008) | 5 lines
Raise an error instead of crashing with a segfault when a NULL
function pointer is called.
Will backport to release25-maint.
........
r59927 | thomas.heller | 2008-01-11 21:29:19 +0100 (Fri, 11 Jan 2008) | 4 lines
Fix a potential 'SystemError: NULL result without error'.
NULL may be a valid return value from PyLong_AsVoidPtr.
Will backport to release25-maint.
........
r59928 | raymond.hettinger | 2008-01-12 00:25:18 +0100 (Sat, 12 Jan 2008) | 1 line
Update the opcode docs for STORE_MAP and BUILD_MAP
........
r59929 | mark.dickinson | 2008-01-12 02:56:00 +0100 (Sat, 12 Jan 2008) | 4 lines
Issue 1780: Allow leading and trailing whitespace in Decimal constructor,
when constructing from a string. Disallow trailing newlines in
Context.create_decimal.
........
r59930 | georg.brandl | 2008-01-12 11:53:29 +0100 (Sat, 12 Jan 2008) | 3 lines
Move OSError docs to exceptions doc, remove obsolete descriptions
from os docs, rework posix docs.
........
r59931 | georg.brandl | 2008-01-12 14:47:57 +0100 (Sat, 12 Jan 2008) | 3 lines
Patch #1700288: Method cache optimization, by Armin Rigo, ported to
2.6 by Kevin Jacobs.
........
r59932 | georg.brandl | 2008-01-12 17:11:09 +0100 (Sat, 12 Jan 2008) | 2 lines
Fix editing glitch.
........
2008-01-12 15:39:10 -04:00
|
|
|
class ResultMixin(object):
|
|
|
|
"""Shared methods for the parsed result objects."""
|
2006-04-21 07:40:58 -03:00
|
|
|
|
|
|
|
@property
|
|
|
|
def username(self):
|
|
|
|
netloc = self.netloc
|
|
|
|
if "@" in netloc:
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
userinfo = netloc.rsplit("@", 1)[0]
|
2006-04-21 07:40:58 -03:00
|
|
|
if ":" in userinfo:
|
|
|
|
userinfo = userinfo.split(":", 1)[0]
|
|
|
|
return userinfo
|
|
|
|
return None
|
|
|
|
|
|
|
|
@property
|
|
|
|
def password(self):
|
|
|
|
netloc = self.netloc
|
|
|
|
if "@" in netloc:
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
userinfo = netloc.rsplit("@", 1)[0]
|
2006-04-21 07:40:58 -03:00
|
|
|
if ":" in userinfo:
|
|
|
|
return userinfo.split(":", 1)[1]
|
|
|
|
return None
|
|
|
|
|
|
|
|
@property
|
|
|
|
def hostname(self):
|
|
|
|
netloc = self.netloc
|
|
|
|
if "@" in netloc:
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
netloc = netloc.rsplit("@", 1)[1]
|
2006-04-21 07:40:58 -03:00
|
|
|
if ":" in netloc:
|
|
|
|
netloc = netloc.split(":", 1)[0]
|
|
|
|
return netloc.lower() or None
|
|
|
|
|
|
|
|
@property
|
|
|
|
def port(self):
|
|
|
|
netloc = self.netloc
|
|
|
|
if "@" in netloc:
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
netloc = netloc.rsplit("@", 1)[1]
|
2006-04-21 07:40:58 -03:00
|
|
|
if ":" in netloc:
|
|
|
|
port = netloc.split(":", 1)[1]
|
|
|
|
return int(port, 10)
|
|
|
|
return None
|
|
|
|
|
Merged revisions 59921-59932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59923 | raymond.hettinger | 2008-01-11 19:04:55 +0100 (Fri, 11 Jan 2008) | 1 line
Speed-up and simplify code urlparse's result objects.
........
r59924 | andrew.kuchling | 2008-01-11 20:33:24 +0100 (Fri, 11 Jan 2008) | 1 line
Bug #1790: update link; remove outdated paragraph
........
r59925 | thomas.heller | 2008-01-11 20:34:06 +0100 (Fri, 11 Jan 2008) | 5 lines
Raise an error instead of crashing with a segfault when a NULL
function pointer is called.
Will backport to release25-maint.
........
r59927 | thomas.heller | 2008-01-11 21:29:19 +0100 (Fri, 11 Jan 2008) | 4 lines
Fix a potential 'SystemError: NULL result without error'.
NULL may be a valid return value from PyLong_AsVoidPtr.
Will backport to release25-maint.
........
r59928 | raymond.hettinger | 2008-01-12 00:25:18 +0100 (Sat, 12 Jan 2008) | 1 line
Update the opcode docs for STORE_MAP and BUILD_MAP
........
r59929 | mark.dickinson | 2008-01-12 02:56:00 +0100 (Sat, 12 Jan 2008) | 4 lines
Issue 1780: Allow leading and trailing whitespace in Decimal constructor,
when constructing from a string. Disallow trailing newlines in
Context.create_decimal.
........
r59930 | georg.brandl | 2008-01-12 11:53:29 +0100 (Sat, 12 Jan 2008) | 3 lines
Move OSError docs to exceptions doc, remove obsolete descriptions
from os docs, rework posix docs.
........
r59931 | georg.brandl | 2008-01-12 14:47:57 +0100 (Sat, 12 Jan 2008) | 3 lines
Patch #1700288: Method cache optimization, by Armin Rigo, ported to
2.6 by Kevin Jacobs.
........
r59932 | georg.brandl | 2008-01-12 17:11:09 +0100 (Sat, 12 Jan 2008) | 2 lines
Fix editing glitch.
........
2008-01-12 15:39:10 -04:00
|
|
|
from collections import namedtuple
|
2006-04-21 07:40:58 -03:00
|
|
|
|
Merged revisions 59921-59932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59923 | raymond.hettinger | 2008-01-11 19:04:55 +0100 (Fri, 11 Jan 2008) | 1 line
Speed-up and simplify code urlparse's result objects.
........
r59924 | andrew.kuchling | 2008-01-11 20:33:24 +0100 (Fri, 11 Jan 2008) | 1 line
Bug #1790: update link; remove outdated paragraph
........
r59925 | thomas.heller | 2008-01-11 20:34:06 +0100 (Fri, 11 Jan 2008) | 5 lines
Raise an error instead of crashing with a segfault when a NULL
function pointer is called.
Will backport to release25-maint.
........
r59927 | thomas.heller | 2008-01-11 21:29:19 +0100 (Fri, 11 Jan 2008) | 4 lines
Fix a potential 'SystemError: NULL result without error'.
NULL may be a valid return value from PyLong_AsVoidPtr.
Will backport to release25-maint.
........
r59928 | raymond.hettinger | 2008-01-12 00:25:18 +0100 (Sat, 12 Jan 2008) | 1 line
Update the opcode docs for STORE_MAP and BUILD_MAP
........
r59929 | mark.dickinson | 2008-01-12 02:56:00 +0100 (Sat, 12 Jan 2008) | 4 lines
Issue 1780: Allow leading and trailing whitespace in Decimal constructor,
when constructing from a string. Disallow trailing newlines in
Context.create_decimal.
........
r59930 | georg.brandl | 2008-01-12 11:53:29 +0100 (Sat, 12 Jan 2008) | 3 lines
Move OSError docs to exceptions doc, remove obsolete descriptions
from os docs, rework posix docs.
........
r59931 | georg.brandl | 2008-01-12 14:47:57 +0100 (Sat, 12 Jan 2008) | 3 lines
Patch #1700288: Method cache optimization, by Armin Rigo, ported to
2.6 by Kevin Jacobs.
........
r59932 | georg.brandl | 2008-01-12 17:11:09 +0100 (Sat, 12 Jan 2008) | 2 lines
Fix editing glitch.
........
2008-01-12 15:39:10 -04:00
|
|
|
class SplitResult(namedtuple('SplitResult', 'scheme netloc path query fragment'), ResultMixin):
|
2006-04-21 07:40:58 -03:00
|
|
|
|
|
|
|
__slots__ = ()
|
|
|
|
|
|
|
|
def geturl(self):
|
|
|
|
return urlunsplit(self)
|
|
|
|
|
|
|
|
|
Merged revisions 59921-59932 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59923 | raymond.hettinger | 2008-01-11 19:04:55 +0100 (Fri, 11 Jan 2008) | 1 line
Speed-up and simplify code urlparse's result objects.
........
r59924 | andrew.kuchling | 2008-01-11 20:33:24 +0100 (Fri, 11 Jan 2008) | 1 line
Bug #1790: update link; remove outdated paragraph
........
r59925 | thomas.heller | 2008-01-11 20:34:06 +0100 (Fri, 11 Jan 2008) | 5 lines
Raise an error instead of crashing with a segfault when a NULL
function pointer is called.
Will backport to release25-maint.
........
r59927 | thomas.heller | 2008-01-11 21:29:19 +0100 (Fri, 11 Jan 2008) | 4 lines
Fix a potential 'SystemError: NULL result without error'.
NULL may be a valid return value from PyLong_AsVoidPtr.
Will backport to release25-maint.
........
r59928 | raymond.hettinger | 2008-01-12 00:25:18 +0100 (Sat, 12 Jan 2008) | 1 line
Update the opcode docs for STORE_MAP and BUILD_MAP
........
r59929 | mark.dickinson | 2008-01-12 02:56:00 +0100 (Sat, 12 Jan 2008) | 4 lines
Issue 1780: Allow leading and trailing whitespace in Decimal constructor,
when constructing from a string. Disallow trailing newlines in
Context.create_decimal.
........
r59930 | georg.brandl | 2008-01-12 11:53:29 +0100 (Sat, 12 Jan 2008) | 3 lines
Move OSError docs to exceptions doc, remove obsolete descriptions
from os docs, rework posix docs.
........
r59931 | georg.brandl | 2008-01-12 14:47:57 +0100 (Sat, 12 Jan 2008) | 3 lines
Patch #1700288: Method cache optimization, by Armin Rigo, ported to
2.6 by Kevin Jacobs.
........
r59932 | georg.brandl | 2008-01-12 17:11:09 +0100 (Sat, 12 Jan 2008) | 2 lines
Fix editing glitch.
........
2008-01-12 15:39:10 -04:00
|
|
|
class ParseResult(namedtuple('ParseResult', 'scheme netloc path params query fragment'), ResultMixin):
|
2006-04-21 07:40:58 -03:00
|
|
|
|
|
|
|
__slots__ = ()
|
|
|
|
|
|
|
|
def geturl(self):
|
|
|
|
return urlunparse(self)
|
|
|
|
|
|
|
|
|
|
|
|
def urlparse(url, scheme='', allow_fragments=True):
|
2001-01-14 23:34:38 -04:00
|
|
|
"""Parse a URL into 6 components:
|
|
|
|
<scheme>://<netloc>/<path>;<params>?<query>#<fragment>
|
|
|
|
Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
|
|
|
|
Note that we don't break the components up in smaller bits
|
|
|
|
(e.g. netloc is a single string) and we don't expand % escapes."""
|
2001-11-15 22:52:57 -04:00
|
|
|
tuple = urlsplit(url, scheme, allow_fragments)
|
|
|
|
scheme, netloc, url, query, fragment = tuple
|
|
|
|
if scheme in uses_params and ';' in url:
|
|
|
|
url, params = _splitparams(url)
|
|
|
|
else:
|
|
|
|
params = ''
|
2006-04-21 07:40:58 -03:00
|
|
|
return ParseResult(scheme, netloc, url, params, query, fragment)
|
2001-11-15 22:52:57 -04:00
|
|
|
|
|
|
|
def _splitparams(url):
|
|
|
|
if '/' in url:
|
|
|
|
i = url.find(';', url.rfind('/'))
|
|
|
|
if i < 0:
|
|
|
|
return url, ''
|
|
|
|
else:
|
|
|
|
i = url.find(';')
|
|
|
|
return url[:i], url[i+1:]
|
|
|
|
|
2005-01-09 11:29:10 -04:00
|
|
|
def _splitnetloc(url, start=0):
|
Merged revisions 59703-59773 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59704 | christian.heimes | 2008-01-04 04:15:05 +0100 (Fri, 04 Jan 2008) | 1 line
Moved include "Python.h" in front of other imports to silence a warning.
........
r59706 | raymond.hettinger | 2008-01-04 04:22:53 +0100 (Fri, 04 Jan 2008) | 10 lines
Minor fix-ups to named tuples:
* Make the _replace() method respect subclassing.
* Using property() to make _fields read-only wasn't a good idea.
It caused len(Point._fields) to fail.
* Add note to _cast() about length checking and alternative with the star-operator.
........
r59707 | jeffrey.yasskin | 2008-01-04 09:01:23 +0100 (Fri, 04 Jan 2008) | 3 lines
Make math.{floor,ceil}({int,long}) return float again for backwards
compatibility after r59671 made them return integral types.
........
r59709 | christian.heimes | 2008-01-04 14:21:07 +0100 (Fri, 04 Jan 2008) | 1 line
Bug #1713: posixpath.ismount() claims symlink to a mountpoint is a mountpoint.
........
r59712 | lars.gustaebel | 2008-01-04 15:00:33 +0100 (Fri, 04 Jan 2008) | 5 lines
Issue #1735: TarFile.extractall() now correctly sets
directory permissions and times.
(will backport to 2.5)
........
r59714 | andrew.kuchling | 2008-01-04 15:47:17 +0100 (Fri, 04 Jan 2008) | 1 line
Update links to bug/patch tracker
........
r59716 | christian.heimes | 2008-01-04 16:23:30 +0100 (Fri, 04 Jan 2008) | 1 line
Added interface to Windows' WSAIoctl and a simple example for a network sniffer.
........
r59717 | christian.heimes | 2008-01-04 16:29:00 +0100 (Fri, 04 Jan 2008) | 1 line
And here is the rest of Hirokazu Yamamoto's patch for VS6.0 support. Thanks Hiro!
........
r59719 | christian.heimes | 2008-01-04 16:34:06 +0100 (Fri, 04 Jan 2008) | 1 line
Reverted last transaction. It's the wrong branch.
........
r59721 | christian.heimes | 2008-01-04 16:48:06 +0100 (Fri, 04 Jan 2008) | 1 line
socket.ioctl is only available on Windows
........
r59722 | andrew.kuchling | 2008-01-04 19:24:41 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59723 | andrew.kuchling | 2008-01-04 19:25:05 +0100 (Fri, 04 Jan 2008) | 1 line
Fix markup
........
r59725 | guido.van.rossum | 2008-01-05 01:59:59 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1725 by Mark Dickinson, fixes incorrect conversion of -1e1000
and adds errors for -0x.
........
r59726 | guido.van.rossum | 2008-01-05 02:21:57 +0100 (Sat, 05 Jan 2008) | 2 lines
Patch #1698 by Senthil: allow '@' in username when parsed by urlparse.py.
........
r59727 | raymond.hettinger | 2008-01-05 02:35:43 +0100 (Sat, 05 Jan 2008) | 1 line
Improve namedtuple's _cast() method with a docstring, new name, and error-checking.
........
r59728 | raymond.hettinger | 2008-01-05 03:17:24 +0100 (Sat, 05 Jan 2008) | 1 line
Add error-checking to namedtuple's _replace() method.
........
r59730 | fred.drake | 2008-01-05 05:38:38 +0100 (Sat, 05 Jan 2008) | 2 lines
clean up a comment
........
r59731 | jeffrey.yasskin | 2008-01-05 09:47:13 +0100 (Sat, 05 Jan 2008) | 11 lines
Continue rolling back pep-3141 changes that changed behavior from 2.5. This
round included:
* Revert round to its 2.6 behavior (half away from 0).
* Because round, floor, and ceil always return float again, it's no
longer necessary to have them delegate to __xxx___, so I've ripped
that out of their implementations and the Real ABC. This also helps
in implementing types that work in both 2.6 and 3.0: you return int
from the __xxx__ methods, and let it get enabled by the version
upgrade.
* Make pow(-1, .5) raise a ValueError again.
........
r59736 | andrew.kuchling | 2008-01-05 16:13:49 +0100 (Sat, 05 Jan 2008) | 1 line
Fix comment typo
........
r59738 | thomas.heller | 2008-01-05 18:15:44 +0100 (Sat, 05 Jan 2008) | 1 line
Add myself.
........
r59739 | georg.brandl | 2008-01-05 18:49:17 +0100 (Sat, 05 Jan 2008) | 2 lines
Fix C++-style comment.
........
r59742 | georg.brandl | 2008-01-05 20:28:16 +0100 (Sat, 05 Jan 2008) | 2 lines
Remove with_statement future imports from 2.6 docs.
........
r59743 | georg.brandl | 2008-01-05 20:29:45 +0100 (Sat, 05 Jan 2008) | 2 lines
Simplify index entries; fix #1712.
........
r59744 | georg.brandl | 2008-01-05 20:44:22 +0100 (Sat, 05 Jan 2008) | 2 lines
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
........
r59749 | georg.brandl | 2008-01-05 21:29:13 +0100 (Sat, 05 Jan 2008) | 2 lines
Revert socket.rst to unix-eol.
........
r59750 | georg.brandl | 2008-01-05 21:33:46 +0100 (Sat, 05 Jan 2008) | 2 lines
Set native svn:eol-style property for text files.
........
r59752 | georg.brandl | 2008-01-05 21:46:29 +0100 (Sat, 05 Jan 2008) | 2 lines
#1719: capitalization error in "UuidCreate".
........
r59753 | georg.brandl | 2008-01-05 22:02:25 +0100 (Sat, 05 Jan 2008) | 2 lines
Repair markup.
........
r59754 | georg.brandl | 2008-01-05 22:10:50 +0100 (Sat, 05 Jan 2008) | 2 lines
Use markup.
........
r59757 | christian.heimes | 2008-01-05 22:35:52 +0100 (Sat, 05 Jan 2008) | 1 line
Final adjustments for #1601
........
r59758 | guido.van.rossum | 2008-01-05 23:19:06 +0100 (Sat, 05 Jan 2008) | 3 lines
Patch #1637: fix urlparse for URLs like 'http://x.com?arg=/foo'.
Fix by John Nagle.
........
r59759 | guido.van.rossum | 2008-01-05 23:20:01 +0100 (Sat, 05 Jan 2008) | 2 lines
Add John Nagle (of issue #1637).
........
r59765 | raymond.hettinger | 2008-01-06 10:02:24 +0100 (Sun, 06 Jan 2008) | 1 line
Small code simplification. Forgot that classmethods can be called from intances.
........
r59766 | martin.v.loewis | 2008-01-06 11:09:48 +0100 (Sun, 06 Jan 2008) | 2 lines
Use vcbuild for VS 2009.
........
r59767 | martin.v.loewis | 2008-01-06 12:03:43 +0100 (Sun, 06 Jan 2008) | 2 lines
Package using VS 2008.
........
r59768 | martin.v.loewis | 2008-01-06 12:13:16 +0100 (Sun, 06 Jan 2008) | 2 lines
Don't try to package msvcr90 for the moment.
........
r59769 | georg.brandl | 2008-01-06 15:17:36 +0100 (Sun, 06 Jan 2008) | 4 lines
#1696393: don't check for '.' and '..' in ntpath.walk since
they aren't returned from os.listdir anymore.
Reported by Michael Haggerty.
........
r59770 | georg.brandl | 2008-01-06 15:27:15 +0100 (Sun, 06 Jan 2008) | 3 lines
#1742: don't raise exception on os.path.relpath("a", "a"), but return os.curdir.
Reported by Jesse Towner.
........
r59771 | georg.brandl | 2008-01-06 15:33:52 +0100 (Sun, 06 Jan 2008) | 2 lines
#1591: Clarify docstring of Popen3.
........
r59772 | georg.brandl | 2008-01-06 16:30:34 +0100 (Sun, 06 Jan 2008) | 2 lines
#1680: fix context manager example function name.
........
r59773 | georg.brandl | 2008-01-06 16:34:57 +0100 (Sun, 06 Jan 2008) | 2 lines
#1755097: document default values for [].sort() and sorted().
........
2008-01-06 12:59:19 -04:00
|
|
|
delim = len(url) # position of end of domain part of url, default is end
|
|
|
|
for c in '/?#': # look for delimiters; the order is NOT important
|
|
|
|
wdelim = url.find(c, start) # find first of this delim
|
|
|
|
if wdelim >= 0: # if found
|
|
|
|
delim = min(delim, wdelim) # use earliest delim position
|
|
|
|
return url[start:delim], url[delim:] # return (domain, rest)
|
2005-01-09 11:29:10 -04:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
def urlsplit(url, scheme='', allow_fragments=True):
|
2001-11-15 22:52:57 -04:00
|
|
|
"""Parse a URL into 5 components:
|
|
|
|
<scheme>://<netloc>/<path>?<query>#<fragment>
|
|
|
|
Return a 5-tuple: (scheme, netloc, path, query, fragment).
|
|
|
|
Note that we don't break the components up in smaller bits
|
|
|
|
(e.g. netloc is a single string) and we don't expand % escapes."""
|
2006-04-21 07:40:58 -03:00
|
|
|
allow_fragments = bool(allow_fragments)
|
Merged revisions 59465-59487 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59467 | georg.brandl | 2007-12-11 17:32:49 +0100 (Tue, 11 Dec 2007) | 2 lines
Add another GHOP contributor.
........
r59468 | kurt.kaiser | 2007-12-11 20:35:12 +0100 (Tue, 11 Dec 2007) | 3 lines
IDLE_tabbedpages.071101.patch Tal Einat
Cosmetic changes, one bug. Remove tabpage.py, replaced by tabbedpages.py
........
r59471 | gerhard.haering | 2007-12-11 22:07:40 +0100 (Tue, 11 Dec 2007) | 9 lines
Forward-port of commit 59184.
- Backported a workaround for a bug in SQLite 3.2.x/3.3.x versions where a
statement recompilation with no bound parameters lead to a segfault
- Backported a fix necessary because of an SQLite API change in version
3.5.
This prevents segfaults when executing empty queries, like our test suite
does
........
r59475 | christian.heimes | 2007-12-12 19:09:06 +0100 (Wed, 12 Dec 2007) | 1 line
Fixed a nasty problem in the xxmodule.c
........
r59478 | raymond.hettinger | 2007-12-13 01:08:37 +0100 (Thu, 13 Dec 2007) | 1 line
Fix bug 1604. deque.__init__() did not clear existing contents like list.__init__. Not a backport candidate.
........
r59480 | alexandre.vassalotti | 2007-12-13 18:58:23 +0100 (Thu, 13 Dec 2007) | 2 lines
Fix issue #1313119: urlparse "caches" parses regardless of encoding
........
r59482 | christian.heimes | 2007-12-13 20:23:16 +0100 (Thu, 13 Dec 2007) | 1 line
Fixed bug #1613: Makefile's VPATH feature is broken
........
r59484 | guido.van.rossum | 2007-12-13 21:50:10 +0100 (Thu, 13 Dec 2007) | 3 lines
Patch #1608. Someone with access to autoconf 2.61 or higher needs to
run it and check in the resulting configure file.
........
r59485 | thomas.heller | 2007-12-13 22:20:29 +0100 (Thu, 13 Dec 2007) | 1 line
Ran autoconf.
........
r59486 | raymond.hettinger | 2007-12-13 23:55:52 +0100 (Thu, 13 Dec 2007) | 1 line
Simplify implementation of __replace__()
........
r59487 | raymond.hettinger | 2007-12-14 00:52:59 +0100 (Fri, 14 Dec 2007) | 1 line
Small speedup
........
2007-12-13 21:24:44 -04:00
|
|
|
key = url, scheme, allow_fragments, type(url), type(scheme)
|
2001-01-14 23:34:38 -04:00
|
|
|
cached = _parse_cache.get(key, None)
|
|
|
|
if cached:
|
|
|
|
return cached
|
|
|
|
if len(_parse_cache) >= MAX_CACHE_SIZE: # avoid runaway growth
|
|
|
|
clear_cache()
|
2001-11-15 22:52:57 -04:00
|
|
|
netloc = query = fragment = ''
|
2001-01-14 23:34:38 -04:00
|
|
|
i = url.find(':')
|
|
|
|
if i > 0:
|
|
|
|
if url[:i] == 'http': # optimize the common case
|
|
|
|
scheme = url[:i].lower()
|
|
|
|
url = url[i+1:]
|
|
|
|
if url[:2] == '//':
|
2005-01-09 11:29:10 -04:00
|
|
|
netloc, url = _splitnetloc(url, 2)
|
2001-11-15 22:52:57 -04:00
|
|
|
if allow_fragments and '#' in url:
|
|
|
|
url, fragment = url.split('#', 1)
|
|
|
|
if '?' in url:
|
|
|
|
url, query = url.split('?', 1)
|
2006-04-21 07:40:58 -03:00
|
|
|
v = SplitResult(scheme, netloc, url, query, fragment)
|
|
|
|
_parse_cache[key] = v
|
|
|
|
return v
|
2001-01-14 23:34:38 -04:00
|
|
|
for c in url[:i]:
|
|
|
|
if c not in scheme_chars:
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
scheme, url = url[:i].lower(), url[i+1:]
|
2005-01-09 11:29:10 -04:00
|
|
|
if scheme in uses_netloc and url[:2] == '//':
|
|
|
|
netloc, url = _splitnetloc(url, 2)
|
2001-11-15 22:52:57 -04:00
|
|
|
if allow_fragments and scheme in uses_fragment and '#' in url:
|
|
|
|
url, fragment = url.split('#', 1)
|
|
|
|
if scheme in uses_query and '?' in url:
|
|
|
|
url, query = url.split('?', 1)
|
2006-04-21 07:40:58 -03:00
|
|
|
v = SplitResult(scheme, netloc, url, query, fragment)
|
|
|
|
_parse_cache[key] = v
|
|
|
|
return v
|
1994-09-12 07:36:35 -03:00
|
|
|
|
2007-05-15 15:46:22 -03:00
|
|
|
def urlunparse(components):
|
2001-01-14 23:34:38 -04:00
|
|
|
"""Put a parsed URL back together again. This may result in a
|
|
|
|
slightly different, but equivalent URL, if the URL that was parsed
|
|
|
|
originally had redundant delimiters, e.g. a ? with an empty query
|
|
|
|
(the draft states that these are equivalent)."""
|
2007-05-15 15:46:22 -03:00
|
|
|
scheme, netloc, url, params, query, fragment = components
|
2001-11-15 22:52:57 -04:00
|
|
|
if params:
|
|
|
|
url = "%s;%s" % (url, params)
|
|
|
|
return urlunsplit((scheme, netloc, url, query, fragment))
|
|
|
|
|
2007-05-15 15:46:22 -03:00
|
|
|
def urlunsplit(components):
|
|
|
|
scheme, netloc, url, query, fragment = components
|
2002-10-14 16:59:54 -03:00
|
|
|
if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
|
2001-01-14 23:34:38 -04:00
|
|
|
if url and url[:1] != '/': url = '/' + url
|
|
|
|
url = '//' + (netloc or '') + url
|
|
|
|
if scheme:
|
|
|
|
url = scheme + ':' + url
|
|
|
|
if query:
|
|
|
|
url = url + '?' + query
|
|
|
|
if fragment:
|
|
|
|
url = url + '#' + fragment
|
|
|
|
return url
|
1994-09-12 07:36:35 -03:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
def urljoin(base, url, allow_fragments=True):
|
2001-01-14 23:34:38 -04:00
|
|
|
"""Join a base URL and a possibly relative URL to form an absolute
|
|
|
|
interpretation of the latter."""
|
|
|
|
if not base:
|
|
|
|
return url
|
|
|
|
if not url:
|
|
|
|
return base
|
|
|
|
bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
|
|
|
|
urlparse(base, '', allow_fragments)
|
|
|
|
scheme, netloc, path, params, query, fragment = \
|
|
|
|
urlparse(url, bscheme, allow_fragments)
|
|
|
|
if scheme != bscheme or scheme not in uses_relative:
|
|
|
|
return url
|
|
|
|
if scheme in uses_netloc:
|
|
|
|
if netloc:
|
|
|
|
return urlunparse((scheme, netloc, path,
|
|
|
|
params, query, fragment))
|
|
|
|
netloc = bnetloc
|
|
|
|
if path[:1] == '/':
|
|
|
|
return urlunparse((scheme, netloc, path,
|
|
|
|
params, query, fragment))
|
2003-10-12 01:29:10 -03:00
|
|
|
if not (path or params or query):
|
2001-01-14 23:34:38 -04:00
|
|
|
return urlunparse((scheme, netloc, bpath,
|
2003-10-12 01:29:10 -03:00
|
|
|
bparams, bquery, fragment))
|
2001-01-14 23:34:38 -04:00
|
|
|
segments = bpath.split('/')[:-1] + path.split('/')
|
|
|
|
# XXX The stuff below is bogus in various ways...
|
|
|
|
if segments[-1] == '.':
|
|
|
|
segments[-1] = ''
|
|
|
|
while '.' in segments:
|
|
|
|
segments.remove('.')
|
|
|
|
while 1:
|
|
|
|
i = 1
|
|
|
|
n = len(segments) - 1
|
|
|
|
while i < n:
|
|
|
|
if (segments[i] == '..'
|
|
|
|
and segments[i-1] not in ('', '..')):
|
|
|
|
del segments[i-1:i+1]
|
|
|
|
break
|
|
|
|
i = i+1
|
|
|
|
else:
|
|
|
|
break
|
|
|
|
if segments == ['', '..']:
|
|
|
|
segments[-1] = ''
|
|
|
|
elif len(segments) >= 2 and segments[-1] == '..':
|
|
|
|
segments[-2:] = ['']
|
|
|
|
return urlunparse((scheme, netloc, '/'.join(segments),
|
|
|
|
params, query, fragment))
|
1994-09-12 07:36:35 -03:00
|
|
|
|
1996-05-28 20:54:24 -03:00
|
|
|
def urldefrag(url):
|
2001-01-14 23:34:38 -04:00
|
|
|
"""Removes any existing fragment from URL.
|
1996-05-28 20:54:24 -03:00
|
|
|
|
2001-01-14 23:34:38 -04:00
|
|
|
Returns a tuple of the defragmented URL and the fragment. If
|
|
|
|
the URL contained no fragments, the second element is the
|
|
|
|
empty string.
|
|
|
|
"""
|
2001-11-15 22:52:57 -04:00
|
|
|
if '#' in url:
|
|
|
|
s, n, p, a, q, frag = urlparse(url)
|
|
|
|
defrag = urlunparse((s, n, p, a, q, ''))
|
|
|
|
return defrag, frag
|
|
|
|
else:
|
|
|
|
return url, ''
|
1996-05-28 20:54:24 -03:00
|
|
|
|
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
_hextochr = dict(('%02x' % i, chr(i)) for i in range(256))
|
|
|
|
_hextochr.update(('%02X' % i, chr(i)) for i in range(256))
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
def unquote(s):
|
2008-06-18 17:49:58 -03:00
|
|
|
"""unquote('abc%20def') -> 'abc def'."""
|
|
|
|
res = s.split('%')
|
|
|
|
for i in range(1, len(res)):
|
2008-08-06 16:31:34 -03:00
|
|
|
item = res[i]
|
|
|
|
try:
|
|
|
|
res[i] = _hextochr[item[:2]] + item[2:]
|
|
|
|
except KeyError:
|
|
|
|
res[i] = '%' + item
|
|
|
|
except UnicodeDecodeError:
|
|
|
|
res[i] = chr(int(item[:2], 16)) + item[2:]
|
|
|
|
return "".join(res)
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
def unquote_plus(s):
|
|
|
|
"""unquote('%7e/abc+def') -> '~/abc def'"""
|
|
|
|
s = s.replace('+', ' ')
|
|
|
|
return unquote(s)
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
|
|
'abcdefghijklmnopqrstuvwxyz'
|
|
|
|
'0123456789' '_.-')
|
|
|
|
_safe_quoters= {}
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
class Quoter:
|
|
|
|
def __init__(self, safe):
|
|
|
|
self.cache = {}
|
|
|
|
self.safe = safe + always_safe
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
def __call__(self, c):
|
|
|
|
try:
|
|
|
|
return self.cache[c]
|
|
|
|
except KeyError:
|
|
|
|
if ord(c) < 256:
|
|
|
|
res = (c in self.safe) and c or ('%%%02X' % ord(c))
|
|
|
|
self.cache[c] = res
|
|
|
|
return res
|
|
|
|
else:
|
|
|
|
return "".join(['%%%02X' % i for i in c.encode("utf-8")])
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
def quote(s, safe = '/'):
|
|
|
|
"""quote('abc def') -> 'abc%20def'
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
Each part of a URL, e.g. the path info, the query, etc., has a
|
|
|
|
different set of reserved characters that must be quoted.
|
|
|
|
|
|
|
|
RFC 2396 Uniform Resource Identifiers (URI): Generic Syntax lists
|
|
|
|
the following reserved characters.
|
2008-06-18 17:49:58 -03:00
|
|
|
|
2008-08-06 16:31:34 -03:00
|
|
|
reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
|
|
|
|
"$" | ","
|
|
|
|
|
|
|
|
Each of these characters is reserved in some component of a URL,
|
|
|
|
but not necessarily in all of them.
|
|
|
|
|
|
|
|
By default, the quote function is intended for quoting the path
|
|
|
|
section of a URL. Thus, it will not encode '/'. This character
|
|
|
|
is reserved, but in typical usage the quote function is being
|
|
|
|
called on a path where the existing slash characters are used as
|
|
|
|
reserved characters.
|
|
|
|
"""
|
|
|
|
cachekey = (safe, always_safe)
|
|
|
|
try:
|
|
|
|
quoter = _safe_quoters[cachekey]
|
|
|
|
except KeyError:
|
|
|
|
quoter = Quoter(safe)
|
|
|
|
_safe_quoters[cachekey] = quoter
|
|
|
|
res = map(quoter, s)
|
|
|
|
return ''.join(res)
|
|
|
|
|
|
|
|
def quote_plus(s, safe = ''):
|
|
|
|
"""Quote the query fragment of a URL; replacing ' ' with '+'"""
|
|
|
|
if ' ' in s:
|
|
|
|
s = quote(s, safe + ' ')
|
|
|
|
return s.replace(' ', '+')
|
|
|
|
return quote(s, safe)
|
2008-06-18 17:49:58 -03:00
|
|
|
|
|
|
|
def urlencode(query,doseq=0):
|
|
|
|
"""Encode a sequence of two-element tuples or dictionary into a URL query string.
|
|
|
|
|
|
|
|
If any values in the query arg are sequences and doseq is true, each
|
|
|
|
sequence element is converted to a separate parameter.
|
|
|
|
|
|
|
|
If the query arg is a sequence of two-element tuples, the order of the
|
|
|
|
parameters in the output will match the order of parameters in the
|
|
|
|
input.
|
|
|
|
"""
|
|
|
|
|
|
|
|
if hasattr(query,"items"):
|
|
|
|
# mapping objects
|
|
|
|
query = query.items()
|
|
|
|
else:
|
|
|
|
# it's a bother at times that strings and string-like objects are
|
|
|
|
# sequences...
|
|
|
|
try:
|
|
|
|
# non-sequence items should not work with len()
|
|
|
|
# non-empty strings will fail this
|
|
|
|
if len(query) and not isinstance(query[0], tuple):
|
|
|
|
raise TypeError
|
|
|
|
# zero-length sequences of all types will get here and succeed,
|
|
|
|
# but that's a minor nit - since the original implementation
|
|
|
|
# allowed empty dicts that type of behavior probably should be
|
|
|
|
# preserved for consistency
|
|
|
|
except TypeError:
|
|
|
|
ty,va,tb = sys.exc_info()
|
|
|
|
raise TypeError("not a valid non-string sequence or mapping object").with_traceback(tb)
|
|
|
|
|
|
|
|
l = []
|
|
|
|
if not doseq:
|
|
|
|
# preserve old behavior
|
|
|
|
for k, v in query:
|
|
|
|
k = quote_plus(str(k))
|
|
|
|
v = quote_plus(str(v))
|
|
|
|
l.append(k + '=' + v)
|
|
|
|
else:
|
|
|
|
for k, v in query:
|
|
|
|
k = quote_plus(str(k))
|
|
|
|
if isinstance(v, str):
|
|
|
|
v = quote_plus(v)
|
|
|
|
l.append(k + '=' + v)
|
|
|
|
elif isinstance(v, str):
|
|
|
|
# is there a reasonable way to convert to ASCII?
|
|
|
|
# encode generates a string, but "replace" or "ignore"
|
|
|
|
# lose information and "strict" can raise UnicodeError
|
2008-08-06 16:31:34 -03:00
|
|
|
v = quote_plus(v.encode("ASCII","replace"))
|
2008-06-18 17:49:58 -03:00
|
|
|
l.append(k + '=' + v)
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
# is this a sufficient test for sequence-ness?
|
|
|
|
x = len(v)
|
|
|
|
except TypeError:
|
|
|
|
# not a sequence
|
|
|
|
v = quote_plus(str(v))
|
|
|
|
l.append(k + '=' + v)
|
|
|
|
else:
|
|
|
|
# loop over the sequence
|
|
|
|
for elt in v:
|
|
|
|
l.append(k + '=' + quote_plus(str(elt)))
|
|
|
|
return '&'.join(l)
|
|
|
|
|
|
|
|
# Utilities to parse URLs (most of these return None for missing parts):
|
|
|
|
# unwrap('<URL:type://host/path>') --> 'type://host/path'
|
|
|
|
# splittype('type:opaquestring') --> 'type', 'opaquestring'
|
|
|
|
# splithost('//host[:port]/path') --> 'host[:port]', '/path'
|
|
|
|
# splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'
|
|
|
|
# splitpasswd('user:passwd') -> 'user', 'passwd'
|
|
|
|
# splitport('host:port') --> 'host', 'port'
|
|
|
|
# splitquery('/path?query') --> '/path', 'query'
|
|
|
|
# splittag('/path#tag') --> '/path', 'tag'
|
|
|
|
# splitattr('/path;attr1=value1;attr2=value2;...') ->
|
|
|
|
# '/path', ['attr1=value1', 'attr2=value2', ...]
|
|
|
|
# splitvalue('attr=value') --> 'attr', 'value'
|
|
|
|
# urllib.parse.unquote('abc%20def') -> 'abc def'
|
|
|
|
# quote('abc def') -> 'abc%20def')
|
|
|
|
|
2008-07-01 16:56:00 -03:00
|
|
|
def to_bytes(url):
|
|
|
|
"""to_bytes(u"URL") --> 'URL'."""
|
2008-06-18 17:49:58 -03:00
|
|
|
# Most URL schemes require ASCII. If that changes, the conversion
|
|
|
|
# can be relaxed.
|
2008-07-01 16:56:00 -03:00
|
|
|
# XXX get rid of to_bytes()
|
2008-06-18 17:49:58 -03:00
|
|
|
if isinstance(url, str):
|
|
|
|
try:
|
|
|
|
url = url.encode("ASCII").decode()
|
|
|
|
except UnicodeError:
|
|
|
|
raise UnicodeError("URL " + repr(url) +
|
|
|
|
" contains non-ASCII characters")
|
|
|
|
return url
|
|
|
|
|
|
|
|
def unwrap(url):
|
|
|
|
"""unwrap('<URL:type://host/path>') --> 'type://host/path'."""
|
|
|
|
url = str(url).strip()
|
|
|
|
if url[:1] == '<' and url[-1:] == '>':
|
|
|
|
url = url[1:-1].strip()
|
|
|
|
if url[:4] == 'URL:': url = url[4:].strip()
|
|
|
|
return url
|
|
|
|
|
|
|
|
_typeprog = None
|
|
|
|
def splittype(url):
|
|
|
|
"""splittype('type:opaquestring') --> 'type', 'opaquestring'."""
|
|
|
|
global _typeprog
|
|
|
|
if _typeprog is None:
|
|
|
|
import re
|
|
|
|
_typeprog = re.compile('^([^/:]+):')
|
|
|
|
|
|
|
|
match = _typeprog.match(url)
|
|
|
|
if match:
|
|
|
|
scheme = match.group(1)
|
|
|
|
return scheme.lower(), url[len(scheme) + 1:]
|
|
|
|
return None, url
|
|
|
|
|
|
|
|
_hostprog = None
|
|
|
|
def splithost(url):
|
|
|
|
"""splithost('//host[:port]/path') --> 'host[:port]', '/path'."""
|
|
|
|
global _hostprog
|
|
|
|
if _hostprog is None:
|
|
|
|
import re
|
|
|
|
_hostprog = re.compile('^//([^/?]*)(.*)$')
|
|
|
|
|
|
|
|
match = _hostprog.match(url)
|
|
|
|
if match: return match.group(1, 2)
|
|
|
|
return None, url
|
|
|
|
|
|
|
|
_userprog = None
|
|
|
|
def splituser(host):
|
|
|
|
"""splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
|
|
|
|
global _userprog
|
|
|
|
if _userprog is None:
|
|
|
|
import re
|
|
|
|
_userprog = re.compile('^(.*)@(.*)$')
|
|
|
|
|
|
|
|
match = _userprog.match(host)
|
2008-08-06 16:31:34 -03:00
|
|
|
if match: return map(unquote, match.group(1, 2))
|
2008-06-18 17:49:58 -03:00
|
|
|
return None, host
|
|
|
|
|
|
|
|
_passwdprog = None
|
|
|
|
def splitpasswd(user):
|
|
|
|
"""splitpasswd('user:passwd') -> 'user', 'passwd'."""
|
|
|
|
global _passwdprog
|
|
|
|
if _passwdprog is None:
|
|
|
|
import re
|
|
|
|
_passwdprog = re.compile('^([^:]*):(.*)$')
|
|
|
|
|
|
|
|
match = _passwdprog.match(user)
|
|
|
|
if match: return match.group(1, 2)
|
|
|
|
return user, None
|
|
|
|
|
|
|
|
# splittag('/path#tag') --> '/path', 'tag'
|
|
|
|
_portprog = None
|
|
|
|
def splitport(host):
|
|
|
|
"""splitport('host:port') --> 'host', 'port'."""
|
|
|
|
global _portprog
|
|
|
|
if _portprog is None:
|
|
|
|
import re
|
|
|
|
_portprog = re.compile('^(.*):([0-9]+)$')
|
|
|
|
|
|
|
|
match = _portprog.match(host)
|
|
|
|
if match: return match.group(1, 2)
|
|
|
|
return host, None
|
|
|
|
|
|
|
|
_nportprog = None
|
|
|
|
def splitnport(host, defport=-1):
|
|
|
|
"""Split host and port, returning numeric port.
|
|
|
|
Return given default port if no ':' found; defaults to -1.
|
|
|
|
Return numerical port if a valid number are found after ':'.
|
|
|
|
Return None if ':' but not a valid number."""
|
|
|
|
global _nportprog
|
|
|
|
if _nportprog is None:
|
|
|
|
import re
|
|
|
|
_nportprog = re.compile('^(.*):(.*)$')
|
|
|
|
|
|
|
|
match = _nportprog.match(host)
|
|
|
|
if match:
|
|
|
|
host, port = match.group(1, 2)
|
|
|
|
try:
|
|
|
|
if not port: raise ValueError("no digits")
|
|
|
|
nport = int(port)
|
|
|
|
except ValueError:
|
|
|
|
nport = None
|
|
|
|
return host, nport
|
|
|
|
return host, defport
|
|
|
|
|
|
|
|
_queryprog = None
|
|
|
|
def splitquery(url):
|
|
|
|
"""splitquery('/path?query') --> '/path', 'query'."""
|
|
|
|
global _queryprog
|
|
|
|
if _queryprog is None:
|
|
|
|
import re
|
|
|
|
_queryprog = re.compile('^(.*)\?([^?]*)$')
|
|
|
|
|
|
|
|
match = _queryprog.match(url)
|
|
|
|
if match: return match.group(1, 2)
|
|
|
|
return url, None
|
|
|
|
|
|
|
|
_tagprog = None
|
|
|
|
def splittag(url):
|
|
|
|
"""splittag('/path#tag') --> '/path', 'tag'."""
|
|
|
|
global _tagprog
|
|
|
|
if _tagprog is None:
|
|
|
|
import re
|
|
|
|
_tagprog = re.compile('^(.*)#([^#]*)$')
|
|
|
|
|
|
|
|
match = _tagprog.match(url)
|
|
|
|
if match: return match.group(1, 2)
|
|
|
|
return url, None
|
|
|
|
|
|
|
|
def splitattr(url):
|
|
|
|
"""splitattr('/path;attr1=value1;attr2=value2;...') ->
|
|
|
|
'/path', ['attr1=value1', 'attr2=value2', ...]."""
|
|
|
|
words = url.split(';')
|
|
|
|
return words[0], words[1:]
|
|
|
|
|
|
|
|
_valueprog = None
|
|
|
|
def splitvalue(attr):
|
|
|
|
"""splitvalue('attr=value') --> 'attr', 'value'."""
|
|
|
|
global _valueprog
|
|
|
|
if _valueprog is None:
|
|
|
|
import re
|
|
|
|
_valueprog = re.compile('^([^=]*)=(.*)$')
|
|
|
|
|
|
|
|
match = _valueprog.match(attr)
|
|
|
|
if match: return match.group(1, 2)
|
|
|
|
return attr, None
|
|
|
|
|
1994-09-12 07:36:35 -03:00
|
|
|
test_input = """
|
|
|
|
http://a/b/c/d
|
|
|
|
|
|
|
|
g:h = <URL:g:h>
|
|
|
|
http:g = <URL:http://a/b/c/g>
|
|
|
|
http: = <URL:http://a/b/c/d>
|
|
|
|
g = <URL:http://a/b/c/g>
|
|
|
|
./g = <URL:http://a/b/c/g>
|
|
|
|
g/ = <URL:http://a/b/c/g/>
|
|
|
|
/g = <URL:http://a/g>
|
|
|
|
//g = <URL:http://g>
|
|
|
|
?y = <URL:http://a/b/c/d?y>
|
|
|
|
g?y = <URL:http://a/b/c/g?y>
|
|
|
|
g?y/./x = <URL:http://a/b/c/g?y/./x>
|
|
|
|
. = <URL:http://a/b/c/>
|
|
|
|
./ = <URL:http://a/b/c/>
|
|
|
|
.. = <URL:http://a/b/>
|
|
|
|
../ = <URL:http://a/b/>
|
|
|
|
../g = <URL:http://a/b/g>
|
|
|
|
../.. = <URL:http://a/>
|
|
|
|
../../g = <URL:http://a/g>
|
|
|
|
../../../g = <URL:http://a/../g>
|
|
|
|
./../g = <URL:http://a/b/g>
|
|
|
|
./g/. = <URL:http://a/b/c/g/>
|
|
|
|
/./g = <URL:http://a/./g>
|
|
|
|
g/./h = <URL:http://a/b/c/g/h>
|
|
|
|
g/../h = <URL:http://a/b/c/h>
|
|
|
|
http:g = <URL:http://a/b/c/g>
|
|
|
|
http: = <URL:http://a/b/c/d>
|
1999-01-06 18:13:09 -04:00
|
|
|
http:?y = <URL:http://a/b/c/d?y>
|
|
|
|
http:g?y = <URL:http://a/b/c/g?y>
|
|
|
|
http:g?y/./x = <URL:http://a/b/c/g?y/./x>
|
1994-09-12 07:36:35 -03:00
|
|
|
"""
|
|
|
|
|
|
|
|
def test():
|
2001-01-14 23:34:38 -04:00
|
|
|
base = ''
|
|
|
|
if sys.argv[1:]:
|
|
|
|
fn = sys.argv[1]
|
|
|
|
if fn == '-':
|
|
|
|
fp = sys.stdin
|
|
|
|
else:
|
|
|
|
fp = open(fn)
|
|
|
|
else:
|
2007-05-17 21:51:22 -03:00
|
|
|
from io import StringIO
|
2004-12-31 15:15:26 -04:00
|
|
|
fp = StringIO(test_input)
|
Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60151 | christian.heimes | 2008-01-21 14:11:15 +0100 (Mon, 21 Jan 2008) | 1 line
A bunch of header files were not listed as dependencies for object files. Changes to files like Parser/parser.h weren't picked up by make.
........
r60152 | georg.brandl | 2008-01-21 15:16:46 +0100 (Mon, 21 Jan 2008) | 3 lines
#1087741: make mmap.mmap the type of mmap objects, not a
factory function. Allow it to be subclassed.
........
r60153 | georg.brandl | 2008-01-21 15:18:14 +0100 (Mon, 21 Jan 2008) | 2 lines
mmap is an extension module.
........
r60154 | georg.brandl | 2008-01-21 17:28:13 +0100 (Mon, 21 Jan 2008) | 2 lines
Fix example.
........
r60155 | georg.brandl | 2008-01-21 17:34:07 +0100 (Mon, 21 Jan 2008) | 2 lines
#1555501: document plistlib and move it to the general library.
........
r60156 | georg.brandl | 2008-01-21 17:36:00 +0100 (Mon, 21 Jan 2008) | 2 lines
Add a stub for bundlebuilder documentation.
........
r60157 | georg.brandl | 2008-01-21 17:46:58 +0100 (Mon, 21 Jan 2008) | 2 lines
Removing bundlebuilder docs again -- it's not to be used anymore (see #779825).
........
r60158 | georg.brandl | 2008-01-21 17:51:51 +0100 (Mon, 21 Jan 2008) | 2 lines
#997912: acknowledge nested scopes in tutorial.
........
r60159 | vinay.sajip | 2008-01-21 18:02:26 +0100 (Mon, 21 Jan 2008) | 1 line
Fix: #1836: Off-by-one bug in TimedRotatingFileHandler rollover calculation. Patch thanks to Kathryn M. Kowalski.
........
r60161 | georg.brandl | 2008-01-21 18:13:03 +0100 (Mon, 21 Jan 2008) | 2 lines
Adapt pydoc to new doc URLs.
........
r60162 | georg.brandl | 2008-01-21 18:17:00 +0100 (Mon, 21 Jan 2008) | 2 lines
Fix old link.
........
r60163 | georg.brandl | 2008-01-21 18:22:06 +0100 (Mon, 21 Jan 2008) | 2 lines
#1726198: replace while 1: fp.readline() with file iteration.
........
r60164 | georg.brandl | 2008-01-21 18:29:23 +0100 (Mon, 21 Jan 2008) | 2 lines
Clarify $ behavior in re docstring. #1631394.
........
r60165 | vinay.sajip | 2008-01-21 18:39:22 +0100 (Mon, 21 Jan 2008) | 1 line
Minor documentation change - hyperlink tidied up.
........
r60166 | georg.brandl | 2008-01-21 18:42:40 +0100 (Mon, 21 Jan 2008) | 2 lines
#1530959: change distutils build dir for --with-pydebug python builds.
........
r60167 | vinay.sajip | 2008-01-21 19:16:05 +0100 (Mon, 21 Jan 2008) | 1 line
Updated to include news on recent logging fixes and documentation changes.
........
r60168 | georg.brandl | 2008-01-21 19:35:49 +0100 (Mon, 21 Jan 2008) | 3 lines
Issue #1882: when compiling code from a string, encoding cookies in the
second line of code were not always recognized correctly.
........
r60170 | georg.brandl | 2008-01-21 19:36:51 +0100 (Mon, 21 Jan 2008) | 2 lines
Add NEWS entry for #1882.
........
r60172 | georg.brandl | 2008-01-21 19:41:24 +0100 (Mon, 21 Jan 2008) | 2 lines
Use original location of document, which has translations.
........
r60173 | walter.doerwald | 2008-01-21 21:18:04 +0100 (Mon, 21 Jan 2008) | 2 lines
Follow PEP 8 in module docstring.
........
r60175 | georg.brandl | 2008-01-21 21:20:53 +0100 (Mon, 21 Jan 2008) | 2 lines
Adapt to latest doctools refactoring.
........
2008-01-21 16:36:10 -04:00
|
|
|
for line in fp:
|
2001-01-14 23:34:38 -04:00
|
|
|
words = line.split()
|
|
|
|
if not words:
|
|
|
|
continue
|
|
|
|
url = words[0]
|
|
|
|
parts = urlparse(url)
|
2007-02-09 01:37:30 -04:00
|
|
|
print('%-10s : %s' % (url, parts))
|
2001-01-14 23:34:38 -04:00
|
|
|
abs = urljoin(base, url)
|
|
|
|
if not base:
|
|
|
|
base = abs
|
|
|
|
wrapped = '<URL:%s>' % abs
|
2007-02-09 01:37:30 -04:00
|
|
|
print('%-10s = %s' % (url, wrapped))
|
2001-01-14 23:34:38 -04:00
|
|
|
if len(words) == 3 and words[1] == '=':
|
|
|
|
if wrapped != words[2]:
|
2007-02-09 01:37:30 -04:00
|
|
|
print('EXPECTED', words[2], '!!!!!!!!!!')
|
1994-09-12 07:36:35 -03:00
|
|
|
|
|
|
|
if __name__ == '__main__':
|
2001-01-14 23:34:38 -04:00
|
|
|
test()
|