mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix duplicate import.

Browse source
This commit is contained in:
Georg Brandl 2010-02-06 22:44:17 +00:00
parent 239f138aea
commit 48e65f5f66
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/urllib.py
View file

@ -28,7 +28,6 @@ import os
import time import time
import sys import sys
from urlparse import urljoin as basejoin from urlparse import urljoin as basejoin
import warnings
__all__ = ["urlopen", "URLopener", "FancyURLopener", "urlretrieve", __all__ = ["urlopen", "URLopener", "FancyURLopener", "urlretrieve",
"urlcleanup", "quote", "quote_plus", "unquote", "unquote_plus", "urlcleanup", "quote", "quote_plus", "unquote", "unquote_plus",
@ -72,8 +71,8 @@ _urlopener = None
def urlopen(url, data=None, proxies=None): def urlopen(url, data=None, proxies=None):
"""Create a file-like object for the specified URL to read from.""" """Create a file-like object for the specified URL to read from."""
from warnings import warnpy3k from warnings import warnpy3k
warnings.warnpy3k("urllib.urlopen() has been removed in Python 3.0 in " warnpy3k("urllib.urlopen() has been removed in Python 3.0 in "
"favor of urllib2.urlopen()", stacklevel=2) "favor of urllib2.urlopen()", stacklevel=2)
global _urlopener global _urlopener
if proxies is not None: if proxies is not None: