[Python-checkins] CVS: python/dist/src/Lib CGIHTTPServer.py,1.15,1.16

[Eric S. Raymond]

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

Modified Files:
	CGIHTTPServer.py 
Log Message:
String method conversion.


Index: CGIHTTPServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/CGIHTTPServer.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** CGIHTTPServer.py	2001/01/20 19:54:20	1.15
--- CGIHTTPServer.py	2001/02/09 08:46:26	1.16
***************
*** 104,113 ****
          """Execute a CGI script."""
          dir, rest = self.cgi_info
!         i = string.rfind(rest, '?')
          if i >= 0:
              rest, query = rest[:i], rest[i+1:]
          else:
              query = ''
!         i = string.find(rest, '/')
          if i >= 0:
              script, rest = rest[:i], rest[i:]
--- 104,113 ----
          """Execute a CGI script."""
          dir, rest = self.cgi_info
!         i = rest.rfind('?')
          if i >= 0:
              rest, query = rest[:i], rest[i+1:]
          else:
              query = ''
!         i = rest.find('/')
          if i >= 0:
              script, rest = rest[:i], rest[i:]
***************
*** 166,173 ****
          for line in self.headers.getallmatchingheaders('accept'):
              if line[:1] in string.whitespace:
!                 accept.append(string.strip(line))
              else:
!                 accept = accept + string.split(line[7:], ',')
!         env['HTTP_ACCEPT'] = string.joinfields(accept, ',')
          ua = self.headers.getheader('user-agent')
          if ua:
--- 166,173 ----
          for line in self.headers.getallmatchingheaders('accept'):
              if line[:1] in string.whitespace:
!                 accept.append(line.strip())
              else:
!                 accept = accept + line[7:].split(',')
!         env['HTTP_ACCEPT'] = ','.join(accept)
          ua = self.headers.getheader('user-agent')
          if ua:
***************
*** 175,179 ****
          co = filter(None, self.headers.getheaders('cookie'))
          if co:
!             env['HTTP_COOKIE'] = string.join(co, ', ')
          # XXX Other HTTP_* headers
          if not self.have_fork:
--- 175,179 ----
          co = filter(None, self.headers.getheaders('cookie'))
          if co:
!             env['HTTP_COOKIE'] = ', '.join(co)
          # XXX Other HTTP_* headers
          if not self.have_fork:
***************
*** 186,190 ****
          self.send_response(200, "Script output follows")
  
!         decoded_query = string.replace(query, '+', ' ')
  
          if self.have_fork:
--- 186,190 ----
          self.send_response(200, "Script output follows")
  
!         decoded_query = query.replace('+', ' ')
  
          if self.have_fork: