[Python-checkins] CVS: python/dist/src/Lib/plat-irix5 cddb.py,1.10,1.11

Eric S. Raymond esr@users.sourceforge.net
Fri, 09 Feb 2001 08:44:51 -0800


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

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


Index: cddb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/cddb.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** cddb.py	1997/10/22 21:00:31	1.10
--- cddb.py	2001/02/09 16:44:49	1.11
***************
*** 31,36 ****
  		for i in range(2, len(toc), 4):
  			tracklist.append((None,
! 				  (string.atoi(toc[i:i+2]),
! 				   string.atoi(toc[i+2:i+4]))))
  	else:
  		tracklist = toc
--- 31,36 ----
  		for i in range(2, len(toc), 4):
  			tracklist.append((None,
! 				  (int(toc[i:i+2]),
! 				   int(toc[i+2:i+4]))))
  	else:
  		tracklist = toc
***************
*** 59,63 ****
  		if os.environ.has_key('CDDB_PATH'):
  			path = os.environ['CDDB_PATH']
! 			cddb_path = string.splitfields(path, ',')
  		else:
  			home = os.environ['HOME']
--- 59,63 ----
  		if os.environ.has_key('CDDB_PATH'):
  			path = os.environ['CDDB_PATH']
! 			cddb_path = path.split(',')
  		else:
  			home = os.environ['HOME']
***************
*** 74,78 ****
  			except IOError:
  				pass
! 		ntracks = string.atoi(self.id[:2], 16)
  		self.artist = ''
  		self.title = ''
--- 74,78 ----
  			except IOError:
  				pass
! 		ntracks = int(self.id[:2], 16)
  		self.artist = ''
  		self.title = ''
***************
*** 107,111 ****
  			elif name1[:5] == 'track':
  				try:
! 					trackno = string.atoi(name1[5:])
  				except strings.atoi_error:
  					print 'syntax error in ' + file
--- 107,111 ----
  			elif name1[:5] == 'track':
  				try:
! 					trackno = int(name1[5:])
  				except strings.atoi_error:
  					print 'syntax error in ' + file
***************
*** 127,133 ****
  			if track and track[0] == ',':
  				try:
! 					off = string.index(self.track[i - 1],
! 							   ',')
! 				except string.index_error:
  					pass
  				else:
--- 127,132 ----
  			if track and track[0] == ',':
  				try:
! 					off = self.track[i - 1].index(',')
! 				except ValueError:
  					pass
  				else:
***************
*** 147,152 ****
  			for i in range(2, len(tracklist), 4):
  				t.append((None, \
! 					  (string.atoi(tracklist[i:i+2]), \
! 					   string.atoi(tracklist[i+2:i+4]))))
  			tracklist = t
  		ntracks = len(tracklist)
--- 146,151 ----
  			for i in range(2, len(tracklist), 4):
  				t.append((None, \
! 					  (int(tracklist[i:i+2]), \
! 					   int(tracklist[i+2:i+4]))))
  			tracklist = t
  		ntracks = len(tracklist)
***************
*** 196,201 ****
  			track = self.track[i]
  			try:
! 				off = string.index(track, ',')
! 			except string.index_error:
  				prevpref = None
  			else:
--- 195,200 ----
  			track = self.track[i]
  			try:
! 				off = track.index(',')
! 			except ValuError:
  				prevpref = None
  			else: