[pywin32-checkins] pywin32/win32/Demos eventLogDemo.py, 1.5.4.1, 1.5.4.2

[Roger U. <ru...@us...>]

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

Modified Files:
      Tag: py3k
	eventLogDemo.py 
Log Message:
Use bytes for raw data passed to ReportEvent
Add multiple string inserts and user sid to events that are written

Index: eventLogDemo.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/eventLogDemo.py,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -d -r1.5.4.1 -r1.5.4.2
*** eventLogDemo.py	29 Aug 2008 04:59:23 -0000	1.5.4.1
--- eventLogDemo.py	1 Oct 2008 03:59:13 -0000	1.5.4.2
***************
*** 3,7 ****
  import win32security # To translate NT Sids to account names.
  
! from win32evtlogutil import *
  
  def ReadLog(computer, logType="Application", dumpEachRecord = 0):
--- 3,7 ----
  import win32security # To translate NT Sids to account names.
  
! import win32evtlogutil
  
  def ReadLog(computer, logType="Application", dumpEachRecord = 0):
***************
*** 18,22 ****
          for object in objects:
              # get it for testing purposes, but dont print it.
!             msg = SafeFormatMessage(object, logType).encode("mbcs")
              if object.Sid is not None:
                  try:
--- 18,22 ----
          for object in objects:
              # get it for testing purposes, but dont print it.
!             msg = win32evtlogutil.SafeFormatMessage(object, logType)
              if object.Sid is not None:
                  try:
***************
*** 83,89 ****
              verbose = verbose + 1
      if do_write:
!         ReportEvent(logType, 2, strings=["The message text for event 2"], data = "Raw\0Data")
!         ReportEvent(logType, 1, eventType=win32evtlog.EVENTLOG_WARNING_TYPE, strings=["A warning"], data = "Raw\0Data")
!         ReportEvent(logType, 1, eventType=win32evtlog.EVENTLOG_INFORMATION_TYPE, strings=["An info"], data = "Raw\0Data")
          print("Successfully wrote 3 records to the log")
  
--- 83,99 ----
              verbose = verbose + 1
      if do_write:
!         ph=win32api.GetCurrentProcess()
!         th = win32security.OpenProcessToken(ph,win32con.TOKEN_READ)
!         my_sid = win32security.GetTokenInformation(th,win32security.TokenUser)[0]
! 
!         win32evtlogutil.ReportEvent(logType, 2,
!             strings=["The message text for event 2","Another insert"],
!             data = b"Raw\0Data", sid = my_sid)
!         win32evtlogutil.ReportEvent(logType, 1, eventType=win32evtlog.EVENTLOG_WARNING_TYPE,
!             strings=["A warning","An even more dire warning"],
!             data = b"Raw\0Data", sid = my_sid)
!         win32evtlogutil.ReportEvent(logType, 1, eventType=win32evtlog.EVENTLOG_INFORMATION_TYPE,
!             strings=["An info","Too much info"],
!             data = b"Raw\0Data", sid = my_sid)
          print("Successfully wrote 3 records to the log")