[Python-checkins] r87449 - in python/branches/release31-maint: Lib/urllib/request.py

Thu Dec 23 20:47:37 CET 2010

Author: r.david.murray
Date: Thu Dec 23 20:47:37 2010
New Revision: 87449
Log:
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 (2010年12月23日) | 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.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/urllib/request.py
Modified: python/branches/release31-maint/Lib/urllib/request.py
==============================================================================

--- python/branches/release31-maint/Lib/urllib/request.py	(original)
+++ python/branches/release31-maint/Lib/urllib/request.py	Thu Dec 23 20:47:37 2010
@@ -258,8 +258,9 @@
 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 = {}
@@ -309,8 +310,6 @@
 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)
 
