[vdrpylib-cvslog] vdrpylib/vdr recording.py,1.2,1.3

[Rob S. <rs...@us...>]

Update of /cvsroot/vdrpylib/vdrpylib/vdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27691

Modified Files:
	recording.py 
Log Message:
Update types support.


Index: recording.py
===================================================================
RCS file: /cvsroot/vdrpylib/vdrpylib/vdr/recording.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** recording.py	25 Nov 2002 22:05:36 -0000	1.2
--- recording.py	24 Nov 2004 17:06:58 -0000	1.3
***************
*** 24,27 ****
--- 24,28 ----
  import struct
  import time
+ from types import *
  
  import svdrp
***************
*** 106,110 ****
  					self.init(line)
  					
! 		elif isinstance(source, string._StringType) and len(source) > 5 and source[:3] == '250':
  			tokens = source.strip()[4:].split(None, 3)
  			if len(tokens) == 4:
--- 107,111 ----
  					self.init(line)
  					
! 		elif isinstance(source, StringType) and len(source) > 5 and source[:3] == '250':
  			tokens = source.strip()[4:].split(None, 3)
  			if len(tokens) == 4:
***************
*** 119,123 ****
  					self.resume = -1
  		
! 		elif isinstance(source, string._StringType) and os.path.isdir(source):
  			pat = re.compile('(/video\d*/)?(.*)/(\d{4}-\d\d-\d\d\.\d\d\.\d\d)\.(\d\d)\.(\d\d)\.rec/?')
  			result = pat.match(source)
--- 120,124 ----
  					self.resume = -1
  		
! 		elif isinstance(source, StringType) and os.path.isdir(source):
  			pat = re.compile('(/video\d*/)?(.*)/(\d{4}-\d\d-\d\d\.\d\d\.\d\d)\.(\d\d)\.(\d\d)\.rec/?')
  			result = pat.match(source)
***************
*** 150,154 ****
  		"""
  		if isinstance(source, svdrp.SVDRP) or \
! 			(isinstance(source, string._StringType) and \
  			os.path.isdir(source)):
  			self.source = source
--- 151,155 ----
  		"""
  		if isinstance(source, svdrp.SVDRP) or \
! 			(isinstance(source, StringType) and \
  			os.path.isdir(source)):
  			self.source = source
***************
*** 189,193 ****
  			if isinstance(self.source, svdrp.SVDRP):
  				self.summary = self.source.lstr(self.index)
! 			elif isinstance(self.source, string._StringType) and os.path.isdir(self.source):
  				fh = open(os.path.join(self.source, 'summary.vdr'), 'r')
  				self.summary = fh.read()
--- 190,194 ----
  			if isinstance(self.source, svdrp.SVDRP):
  				self.summary = self.source.lstr(self.index)
! 			elif isinstance(self.source, StringType) and os.path.isdir(self.source):
  				fh = open(os.path.join(self.source, 'summary.vdr'), 'r')
  				self.summary = fh.read()
***************
*** 232,236 ****
  		"""
  		if self.marks is None:
! 			if isinstance(self.source, string._StringType) and \
  				os.path.isdir(self.source) and \
  				os.path.isfile(os.path.join(self.source, 'marks.vdr')):
--- 233,237 ----
  		"""
  		if self.marks is None:
! 			if isinstance(self.source, StringType) and \
  				os.path.isdir(self.source) and \
  				os.path.isfile(os.path.join(self.source, 'marks.vdr')):
***************
*** 261,265 ****
  		if self.resume is None:
  			dfn = None
! 			if isinstance(self.source, string._StringType) and \
  				os.path.isdir(self.source):
  				if os.path.isfile(os.path.join(self.source, 'resume.vdr')):
--- 262,266 ----
  		if self.resume is None:
  			dfn = None
! 			if isinstance(self.source, StringType) and \
  				os.path.isdir(self.source):
  				if os.path.isfile(os.path.join(self.source, 'resume.vdr')):
***************
*** 270,274 ****
  				else:
  					self.resume = -1
! 			elif isinstance(self.source, string._StringType) and len(self.source) > 5 and self.source[:3] == '250':
  				dfn = self.source
  			elif isinstance(self.source, svdrp.SVDRP):
--- 271,275 ----
  				else:
  					self.resume = -1
! 			elif isinstance(self.source, StringType) and len(self.source) > 5 and self.source[:3] == '250':
  				dfn = self.source
  			elif isinstance(self.source, svdrp.SVDRP):