[pywin32-checkins] pywin32/win32/Lib win32evtlogutil.py, 1.10.4.1, 1.10.4.2 win32serviceutil.py, 1.26.2.2, 1.26.2.3 win32timezone.py, 1.9.2.3, 1.9.2.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1302/win32/Lib

Modified Files:
      Tag: py3k
	win32evtlogutil.py win32serviceutil.py win32timezone.py 
Log Message:
Almost all files in py3k branch are now in py3k syntax - but work remains

Index: win32serviceutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32serviceutil.py,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C2 -d -r1.26.2.2 -r1.26.2.3
*** win32serviceutil.py	26 Nov 2008 09:03:30 -0000	1.26.2.2
--- win32serviceutil.py	27 Nov 2008 04:58:42 -0000	1.26.2.3
***************
*** 613,617 ****
              DebugService(cls, args)
  
!     if not knownArg and len(args)<>1:
          usage() # the rest of the cmds don't take addn args
  
--- 613,617 ----
              DebugService(cls, args)
  
!     if not knownArg and len(args)!=1:
          usage() # the rest of the cmds don't take addn args
  

Index: win32evtlogutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32evtlogutil.py,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -C2 -d -r1.10.4.1 -r1.10.4.2
*** win32evtlogutil.py	26 Nov 2008 09:03:30 -0000	1.10.4.1
--- win32evtlogutil.py	27 Nov 2008 04:58:41 -0000	1.10.4.2
***************
*** 123,127 ****
      finally:
          win32api.RegCloseKey(handle)
!     return data or u'' # Don't want "None" ever being returned.
  
  def SafeFormatMessage( eventLogRecord, logType=None ):
--- 123,127 ----
      finally:
          win32api.RegCloseKey(handle)
!     return data or '' # Don't want "None" ever being returned.
  
  def SafeFormatMessage( eventLogRecord, logType=None ):
***************
*** 136,141 ****
              desc = ""
          else:
!             desc = u", ".join(eventLogRecord.StringInserts)
!         return u"<The description for Event ID ( %d ) in Source ( %r ) could not be found. It contains the following insertion string(s):%r.>" % (winerror.HRESULT_CODE(eventLogRecord.EventID), eventLogRecord.SourceName, desc)
  
  def FeedEventLogRecords(feeder, machineName = None, logName = "Application", readFlags = None):
--- 136,141 ----
              desc = ""
          else:
!             desc = ", ".join(eventLogRecord.StringInserts)
!         return "<The description for Event ID ( %d ) in Source ( %r ) could not be found. It contains the following insertion string(s):%r.>" % (winerror.HRESULT_CODE(eventLogRecord.EventID), eventLogRecord.SourceName, desc)
  
  def FeedEventLogRecords(feeder, machineName = None, logName = "Application", readFlags = None):

Index: win32timezone.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32timezone.py,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** win32timezone.py	26 Nov 2008 09:03:30 -0000	1.9.2.3
--- win32timezone.py	27 Nov 2008 04:58:42 -0000	1.9.2.4
***************
*** 414,418 ****
  	values = _RegValueEnumerator(key)
  	values = tuple(values)
! 	return dict(map(lambda (name,value,type): (name,value), values))
  
  # for backward compatibility
--- 414,418 ----
  	values = _RegValueEnumerator(key)
  	values = tuple(values)
! 	return dict(map(lambda name_value_type: (name_value_type[0],name_value_type[1]), values))
  
  # for backward compatibility