[Python-checkins] python/dist/src/Lib urlparse.py,1.31.6.2,1.31.6.3

[gvanrossum@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	urlparse.py 
Log Message:
Backporting urlparse.py:1.34, test_urlparse.py:1.8:

Fix for 1.33: urlsplit() should only add '//' if scheme != ''.
[SF bug 620705]


Index: urlparse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urlparse.py,v
retrieving revision 1.31.6.2
retrieving revision 1.31.6.3
diff -C2 -d -r1.31.6.2 -r1.31.6.3
*** urlparse.py	25 Sep 2002 19:22:10 -0000	1.31.6.2
--- urlparse.py	14 Oct 2002 20:08:49 -0000	1.31.6.3
***************
*** 129,133 ****
  
  def urlunsplit((scheme, netloc, url, query, fragment)):
!     if netloc or (scheme in uses_netloc and url[:2] != '//'):
          if url and url[:1] != '/': url = '/' + url
          url = '//' + (netloc or '') + url
--- 129,133 ----
  
  def urlunsplit((scheme, netloc, url, query, fragment)):
!     if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
          if url and url[:1] != '/': url = '/' + url
          url = '//' + (netloc or '') + url