summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-23 19:50:56 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-23 19:50:56 (GMT)
commit14f6635762b305d88d9ccfe0793158be0cfc6e78 (patch)
tree5c2e99e60e9a84a0199eec4bacc502ffe2c46f09 /Lib
parente1367f3e638788112347ada786ce1c60f94d2dce (diff)
downloadcpython-14f6635762b305d88d9ccfe0793158be0cfc6e78.zip
cpython-14f6635762b305d88d9ccfe0793158be0cfc6e78.tar.gz
cpython-14f6635762b305d88d9ccfe0793158be0cfc6e78.tar.bz2
Merged revisions 87448 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87448 | r.david.murray | 2010-12-23 14:44:49 -0500 (Thu, 23 Dec 2010) | 4 lines #4496: remove misleading comment and note that self.handlers is obsolete. self.handlers is still used in one urllib2 test, but not by the code iteslf. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/urllib2.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 7d90db2..da030f7 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -299,8 +299,9 @@ class OpenerDirector:
def __init__(self):
client_version = "Python-urllib/%s" % __version__
self.addheaders = [('User-agent', client_version)]
- # manage the individual handlers
+ # self.handlers is retained only for backward compatibility
self.handlers = []
+ # manage the individual handlers
self.handle_open = {}
self.handle_error = {}
self.process_response = {}
@@ -350,8 +351,6 @@ class OpenerDirector:
added = True
if added:
- # the handlers must work in an specific order, the order
- # is specified in a Handler attribute
bisect.insort(self.handlers, handler)
handler.add_parent(self)