mirror of
https://github.com/python/cpython.git
synced 2025-07-28 13:44:43 +00:00
Handle urllib's renaming for Python 3.0:
* Deprecate urllib.urlopen() in favor of urllib2.urlopen() for 3.0. * Update docs to mention split/rename of the module and deprecation of urlopen(). Changes to lib2to3 are in a separate commit. Work is for issue #2885.
This commit is contained in:
parent
aac51b8a69
commit
8bb8fa5dd6
5 changed files with 51 additions and 14 deletions
|
@ -28,6 +28,7 @@ import os
|
|||
import time
|
||||
import sys
|
||||
from urlparse import urljoin as basejoin
|
||||
import warnings
|
||||
|
||||
__all__ = ["urlopen", "URLopener", "FancyURLopener", "urlretrieve",
|
||||
"urlcleanup", "quote", "quote_plus", "unquote", "unquote_plus",
|
||||
|
@ -69,7 +70,11 @@ else:
|
|||
# Shortcut for basic usage
|
||||
_urlopener = None
|
||||
def urlopen(url, data=None, proxies=None):
|
||||
"""urlopen(url [, data]) -> open file-like object"""
|
||||
"""Create a file-like object for the specified URL to read from."""
|
||||
from warnings import warnpy3k
|
||||
warnings.warnpy3k("urllib.urlopen() has been removed in Python 3.0 in "
|
||||
"favor of urllib2.urlopen()", stacklevel=2)
|
||||
|
||||
global _urlopener
|
||||
if proxies is not None:
|
||||
opener = FancyURLopener(proxies=proxies)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue