[Python-checkins] CVS: python/dist/src/Lib mimetools.py,1.19,1.20

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21183

Modified Files:
	mimetools.py 
Log Message:
Get rid of string functions.


Index: mimetools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/mimetools.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** mimetools.py	2000/12/12 23:20:44	1.19
--- mimetools.py	2000/12/15 15:49:08	1.20
***************
*** 4,8 ****
  import os
  import rfc822
- import string
  import tempfile
  
--- 4,7 ----
***************
*** 26,40 ****
  			str = 'text/plain'
  		if ';' in str:
! 			i = string.index(str, ';')
  			self.plisttext = str[i:]
  			str = str[:i]
  		else:
  			self.plisttext = ''
! 		fields = string.splitfields(str, '/')
  		for i in range(len(fields)):
! 			fields[i] = string.lower(string.strip(fields[i]))
! 		self.type = string.joinfields(fields, '/')
  		self.maintype = fields[0]
! 		self.subtype = string.joinfields(fields[1:], '/')
  
  	def parseplist(self):
--- 25,39 ----
  			str = 'text/plain'
  		if ';' in str:
! 			i = str.index(';')
  			self.plisttext = str[i:]
  			str = str[:i]
  		else:
  			self.plisttext = ''
! 		fields = str.split('/')
  		for i in range(len(fields)):
! 			fields[i] = fields[i].strip().lower()
! 		self.type = '/'.join(fields)
  		self.maintype = fields[0]
! 		self.subtype = '/'.join(fields[1:])
  
  	def parseplist(self):
***************
*** 45,57 ****
  			if ';' in str:
  				# XXX Should parse quotes!
! 				end = string.index(str, ';')
  			else:
  				end = len(str)
  			f = str[:end]
  			if '=' in f:
! 				i = string.index(f, '=')
! 				f = string.lower(string.strip(f[:i])) + \
! 					'=' + string.strip(f[i+1:])
! 			self.plist.append(string.strip(f))
  			str = str[end:]
  
--- 44,56 ----
  			if ';' in str:
  				# XXX Should parse quotes!
! 				end = str.index(';')
  			else:
  				end = len(str)
  			f = str[:end]
  			if '=' in f:
! 				i = f.index('=')
! 				f = f[:i].strip().lower() + \
! 					'=' + f[i+1:].strip()
! 			self.plist.append(f.strip())
  			str = str[end:]
  
***************
*** 60,64 ****
  
  	def getparam(self, name):
! 		name = string.lower(name) + '='
  		n = len(name)
  		for p in self.plist:
--- 59,63 ----
  
  	def getparam(self, name):
! 		name = name.lower() + '='
  		n = len(name)
  		for p in self.plist:
***************
*** 70,76 ****
  		result = []
  		for p in self.plist:
! 			i = string.find(p, '=')
  			if i >= 0:
! 				result.append(string.lower(p[:i]))
  		return result
  
--- 69,75 ----
  		result = []
  		for p in self.plist:
! 			i = p.find('=')
  			if i >= 0:
! 				result.append(p[:i].lower())
  		return result
  
***************
*** 78,82 ****
  		if self.encodingheader is None:
  			return '7bit'
! 		return string.lower(self.encodingheader)
  
  	def gettype(self):
--- 77,81 ----
  		if self.encodingheader is None:
  			return '7bit'
! 		return self.encodingheader.lower()
  
  	def gettype(self):