[Python-checkins] python/dist/src/Lib urlparse.py,1.40,1.41

bcannon at users.sourceforge.net bcannon at users.sourceforge.net
Sun Oct 12 00:29:12 EDT 2003


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

Modified Files:
	urlparse.py 
Log Message:
Misc/NEWS

Index: urlparse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urlparse.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** urlparse.py	30 Mar 2003 16:28:26 -0000	1.40
--- urlparse.py	12 Oct 2003 04:29:10 -0000	1.41
***************
*** 158,168 ****
          return urlunparse((scheme, netloc, path,
                             params, query, fragment))
!     if not path:
!         if not params:
!             params = bparams
!             if not query:
!                 query = bquery
          return urlunparse((scheme, netloc, bpath,
!                            params, query, fragment))
      segments = bpath.split('/')[:-1] + path.split('/')
      # XXX The stuff below is bogus in various ways...
--- 158,164 ----
          return urlunparse((scheme, netloc, path,
                             params, query, fragment))
!     if not (path or params or query):
          return urlunparse((scheme, netloc, bpath,
!                            bparams, bquery, fragment))
      segments = bpath.split('/')[:-1] + path.split('/')
      # XXX The stuff below is bogus in various ways...





More information about the Python-checkins mailing list