summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-06 22:44:17 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-06 22:44:17 (GMT)
commit48e65f5f6654b107cc5ea04c46c4e0eb6a32def6 (patch)
tree858313cefbd69f916a4dd55da9457bed6a0e9e16
parent239f138aea2812dc948a46e376f3533efb70e10a (diff)
downloadcpython-48e65f5f6654b107cc5ea04c46c4e0eb6a32def6.zip
cpython-48e65f5f6654b107cc5ea04c46c4e0eb6a32def6.tar.gz
cpython-48e65f5f6654b107cc5ea04c46c4e0eb6a32def6.tar.bz2
Fix duplicate import.
-rw-r--r--Lib/urllib.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index be77e1d..0951237 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -28,7 +28,6 @@ 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",
@@ -72,8 +71,8 @@ _urlopener = None
def urlopen(url, data=None, proxies=None):
"""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)
+ warnpy3k("urllib.urlopen() has been removed in Python 3.0 in "
+ "favor of urllib2.urlopen()", stacklevel=2)
global _urlopener
if proxies is not None: