From b3bfd6b2516420b191aad2cb66a21ee49a3dae6f Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 17 Jun 2009 12:23:29 +0700 Subject: [PATCH] make green.urllib2 importable on 2.6 --- eventlet/green/urllib2.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eventlet/green/urllib2.py b/eventlet/green/urllib2.py index 8244af0..e87b38f 100644 --- a/eventlet/green/urllib2.py +++ b/eventlet/green/urllib2.py @@ -8,8 +8,9 @@ __import_lst = ['__version__', '__cut_port_re', '_parse_proxy'] for var in __import_lst: exec "%s = getattr(urllib2, %r, None)" % (var, var) -del (urlopen, install_opener, build_opener, HTTPHandler, HTTPSHandler, - HTTPCookieProcessor, FileHandler, FTPHandler, CacheFTPHandler, GopherError) +for x in ('urlopen', 'install_opener', 'build_opener', 'HTTPHandler', 'HTTPSHandler', + 'HTTPCookieProcessor', 'FileHandler', 'FTPHandler', 'CacheFTPHandler', 'GopherError'): + globals().pop(x, None) from eventlet.green import httplib import mimetools @@ -24,7 +25,7 @@ except ImportError: from StringIO import StringIO from eventlet.green.urllib import (unwrap, unquote, splittype, splithost, quote, - addinfourl, splitport, splitgophertype, splitquery, + addinfourl, splitport, splitquery, splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue) # support for FileHandler, proxies via environment variables