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.
........

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 7d90db20c99e88fee6fb775b66ab983b6c2b6ef2..da030f74fdbf12284d819f00a68d3749fab886c4 100644 (file)
--- 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)