Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14608
Modified Files:
Tag: py3k
win32pdhutil.py
Log Message:
Remove use of string module
Various fixes for Py3k
Index: win32pdhutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhutil.py,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -C2 -d -r1.12 -r1.12.4.1
*** win32pdhutil.py 16 Jul 2006 09:38:57 -0000 1.12
--- win32pdhutil.py 28 Sep 2008 19:51:43 -0000 1.12.4.1
***************
*** 19,23 ****
"""
! import win32pdh, string, time
error = win32pdh.error
--- 19,23 ----
"""
! import win32pdh, time
error = win32pdh.error
***************
*** 79,83 ****
if bRefresh: # PDH docs say this is how you do a refresh.
win32pdh.EnumObjects(None, machine, 0, 1)
! instanceName = string.lower(instanceName)
items, instances = win32pdh.EnumObjectItems(None,None,object, -1)
# Track multiple instances.
--- 79,83 ----
if bRefresh: # PDH docs say this is how you do a refresh.
win32pdh.EnumObjects(None, machine, 0, 1)
! instanceName = instanceName.lower()
items, instances = win32pdh.EnumObjectItems(None,None,object, -1)
# Track multiple instances.
***************
*** 91,96 ****
ret = []
for instance, max_instances in instance_dict.items():
! for inum in xrange(max_instances+1):
! if string.lower(instance) == instanceName:
ret.append(GetPerformanceAttributes(object, counter,
instance, inum, format,
--- 91,96 ----
ret = []
for instance, max_instances in instance_dict.items():
! for inum in range(max_instances+1):
! if instance.lower() == instanceName:
ret.append(GetPerformanceAttributes(object, counter,
instance, inum, format,
***************
*** 112,118 ****
# Bit of a hack to get useful info.
items = [find_pdh_counter_localized_name("ID Process")] + items[:5]
! print "Process Name", string.join(items,",")
for instance, max_instances in instance_dict.items():
! for inum in xrange(max_instances+1):
hq = win32pdh.OpenQuery()
hcs = []
--- 112,118 ----
# Bit of a hack to get useful info.
items = [find_pdh_counter_localized_name("ID Process")] + items[:5]
! print ("Process Name", ",".join(items))
for instance, max_instances in instance_dict.items():
! for inum in range(max_instances+1):
hq = win32pdh.OpenQuery()
hcs = []
***************
*** 126,133 ****
time.sleep(0.01)
win32pdh.CollectQueryData(hq)
! print "%-15s\t" % (instance[:15]),
for hc in hcs:
type, val = win32pdh.GetFormattedCounterValue(hc, win32pdh.PDH_FMT_LONG)
! print "%5d" % (val),
win32pdh.RemoveCounter(hc)
print
--- 126,133 ----
time.sleep(0.01)
win32pdh.CollectQueryData(hq)
! print ("%-15s\t" % (instance[:15]),)
for hc in hcs:
type, val = win32pdh.GetFormattedCounterValue(hc, win32pdh.PDH_FMT_LONG)
! print ("%5d" % (val),)
win32pdh.RemoveCounter(hc)
print
***************
*** 140,146 ****
result = GetPerformanceAttributes(object, counterName, instance, index,
win32pdh.PDH_FMT_DOUBLE, machine)
! print "Value of '%s' is" % counter, result
! print "Added '%s' on object '%s' (machine %s), instance %s(%d)-parent of %s" \
! % (counterName, object, machine, instance, index, parentInstance)
def browse(callback = BrowseCallBackDemo, title="Python Browser",
--- 140,146 ----
result = GetPerformanceAttributes(object, counterName, instance, index,
win32pdh.PDH_FMT_DOUBLE, machine)
! print ("Value of '%s' is" % counter, result)
! print ("Added '%s' on object '%s' (machine %s), instance %s(%d)-parent of %s" \
! % (counterName, object, machine, instance, index, parentInstance))
def browse(callback = BrowseCallBackDemo, title="Python Browser",
***************
*** 152,161 ****
# Show how to get a couple of attributes by name.
counter = find_pdh_counter_localized_name("Virtual Bytes")
! print "Virtual Bytes = ", FindPerformanceAttributesByName("python",
! counter=counter)
! print "Available Bytes = ", GetPerformanceAttributes(
find_pdh_counter_localized_name("Memory"),
! find_pdh_counter_localized_name("Available Bytes"))
# And a browser.
! print "Browsing for counters..."
browse()
--- 152,161 ----
# Show how to get a couple of attributes by name.
counter = find_pdh_counter_localized_name("Virtual Bytes")
! print ("Virtual Bytes = ", FindPerformanceAttributesByName("python",
! counter=counter))
! print ("Available Bytes = ", GetPerformanceAttributes(
find_pdh_counter_localized_name("Memory"),
! find_pdh_counter_localized_name("Available Bytes")))
# And a browser.
! print ("Browsing for counters...")
browse()
|
