[Python-checkins] python/dist/src/Lib urllib.py,1.135.6.3,1.135.6.4

[rhettinger@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	urllib.py 
Log Message:
Modify splituser() method to allow an @ in the userinfo field.
Jeremy reported that this is not allowed by RFC 2396; however,
other tools support unescaped @'s so we should also.

Apply SF patch 596581 closing bug 581529.


Index: urllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v
retrieving revision 1.135.6.3
retrieving revision 1.135.6.4
diff -C2 -d -r1.135.6.3 -r1.135.6.4
*** urllib.py	18 Apr 2002 02:19:19 -0000	1.135.6.3
--- urllib.py	18 Aug 2002 20:10:08 -0000	1.135.6.4
***************
*** 955,959 ****
      if _userprog is None:
          import re
!         _userprog = re.compile('^([^@]*)@(.*)$')
  
      match = _userprog.match(host)
--- 955,959 ----
      if _userprog is None:
          import re
!         _userprog = re.compile('^(.*)@(.*)$')
  
      match = _userprog.match(host)