[Python-checkins] python/dist/src/Lib urllib2.py,1.45,1.46

[bcannon@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv3425/Lib

Modified Files:
	urllib2.py 
Log Message:
To be on the safe side, backed out any questionable iteritem changes and set back to item calls.

Index: urllib2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** urllib2.py	17 May 2003 19:51:26 -0000	1.45
--- urllib2.py	18 May 2003 02:25:07 -0000	1.46
***************
*** 479,483 ****
          assert hasattr(proxies, 'has_key'), "proxies must be a mapping"
          self.proxies = proxies
!         for type, url in proxies.iteritems():
              setattr(self, '%s_open' % type,
                      lambda r, proxy=url, type=type, meth=self.proxy_open: \
--- 479,483 ----
          assert hasattr(proxies, 'has_key'), "proxies must be a mapping"
          self.proxies = proxies
!         for type, url in proxies.items():
              setattr(self, '%s_open' % type,
                      lambda r, proxy=url, type=type, meth=self.proxy_open: \
***************
*** 806,810 ****
              if name not in req.headers:
                  h.putheader(*args)
!         for k, v in req.headers.iteritems():
              h.putheader(k, v)
          # httplib will attempt to connect() here.  be prepared
--- 806,810 ----
              if name not in req.headers:
                  h.putheader(*args)
!         for k, v in req.headers.items():
              h.putheader(k, v)
          # httplib will attempt to connect() here.  be prepared