[vdrpylib-cvslog] vdrpylib/vdr vdr.py,1.7,1.8

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

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

Modified Files:
	vdr.py 
Log Message:
Remove debug, small cleanup.


Index: vdr.py
===================================================================
RCS file: /cvsroot/vdrpylib/vdrpylib/vdr/vdr.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vdr.py	25 Nov 2004 18:11:25 -0000	1.7
--- vdr.py	1 Dec 2004 18:51:23 -0000	1.8
***************
*** 22,25 ****
--- 22,26 ----
  import os.path
  import re
+ import string
  
  import channel
***************
*** 292,298 ****
  
  	def addchannel(self, channel):
!                 key = '%s-%s-%s-%s-%s' % (channel.source, channel.nid, 
!                                           channel.tid, channel.sid, channel.rid)
!                 print 'DEBUG: key is %s' % key
                  self.channels[key] = channel
  
--- 293,299 ----
  
  	def addchannel(self, channel):
!                 key = string.join([channel.source, channel.nid, channel.tid,
!                                    channel.sid, channel.rid], '-')
! 
                  self.channels[key] = channel
  
***************
*** 318,322 ****
  			if line=='':
  				continue
- 			# print 'EPG line: %s' % line
  
  			# special handling of data coming in via SVDRP
--- 319,322 ----
***************
*** 333,337 ****
  			if line[0] == 'C':
  				# channel start
- 			        print 'EPG channel: %s' % line
  				tokens = line.split()
  				ch_id = tokens[1]
--- 333,336 ----
***************
*** 345,349 ****
  			elif line[0] == 'E':
  				# event start
-                                 # print 'event start'
  				ev = event.Event()
  				ev.parseheader(line[2:])
--- 344,347 ----
***************
*** 364,368 ****
  			elif line[0] == 'e':
  				# event end
-                                 # print 'event end'
  				ch.addevent(ev)
  				ev = None
--- 362,365 ----
***************
*** 370,374 ****
  			elif line[0] == 'c':
  				# channel end
- 				print 'EPG adding: %s' % ch.__str__()
  				self.addchannel(ch)
  				ch = None
--- 367,370 ----
***************
*** 410,414 ****
  			cmd=cmd+' '+classifier
  		result = self.svdrp.write_cmd(cmd)
- 		#print result
  		fh = cStringIO.StringIO(result)
  		return self.parseepg(fh)
--- 406,409 ----