|
From: Mark H. <mha...@us...> - 2008-12-04 07:32:12
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/win32/Lib Modified Files: Tag: py3k win32pdhquery.py win32timezone.py Log Message: many more py3k syntax improvements thanks to 2to3 Index: win32pdhquery.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhquery.py,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** win32pdhquery.py 27 Nov 2008 11:31:07 -0000 1.3.4.1 --- win32pdhquery.py 4 Dec 2008 07:32:06 -0000 1.3.4.2 *************** *** 126,130 **** # Feb 12, 98 - MH added "rawaddcounter" so caller can get exception details. ! import win32pdh, win32api,time, thread,copy class BaseQuery: --- 126,130 ---- # Feb 12, 98 - MH added "rawaddcounter" so caller can get exception details. ! import win32pdh, win32api,time, _thread,copy class BaseQuery: *************** *** 475,479 **** ''' self.collectdatawhile_active = 1 ! thread.start_new_thread(self.collectdatawhile_slave,(period,)) def collectdatawhile_stop(self): ''' --- 475,479 ---- ''' self.collectdatawhile_active = 1 ! _thread.start_new_thread(self.collectdatawhile_slave,(period,)) def collectdatawhile_stop(self): ''' Index: win32timezone.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32timezone.py,v retrieving revision 1.9.2.5 retrieving revision 1.9.2.6 diff -C2 -d -r1.9.2.5 -r1.9.2.6 *** win32timezone.py 27 Nov 2008 11:31:10 -0000 1.9.2.5 --- win32timezone.py 4 Dec 2008 07:32:06 -0000 1.9.2.6 *************** *** 129,133 **** import os ! import _winreg import struct import datetime --- 129,133 ---- import os ! import winreg import struct import datetime *************** *** 153,157 **** if not name: key, name = os.path.split(key) ! value, type = _winreg.QueryValueEx(key, name) self.__init_from_bytes__(value) --- 153,157 ---- if not name: key, name = os.path.split(key) ! value, type = winreg.QueryValueEx(key, name) self.__init_from_bytes__(value) *************** *** 232,236 **** tzRegKeyPath = os.path.join(self.tzRegKey, timeZoneName) try: ! key = _winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKeyPath) except: raise ValueError('Timezone Name %s not found.' % timeZoneName) --- 232,236 ---- tzRegKeyPath = os.path.join(self.tzRegKey, timeZoneName) try: ! key = winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKeyPath) except: raise ValueError('Timezone Name %s not found.' % timeZoneName) *************** *** 243,249 **** """Loads the information from an opened time zone registry key into relevant fields of this TZI object""" ! self.displayName = _winreg.QueryValueEx(key, "Display")[0] ! self.standardName = _winreg.QueryValueEx(key, "Std")[0] ! self.daylightName = _winreg.QueryValueEx(key, "Dlt")[0] self.staticInfo = WinTZI(key, "TZI") self._LoadDynamicInfoFromKey(key) --- 243,249 ---- """Loads the information from an opened time zone registry key into relevant fields of this TZI object""" ! self.displayName = winreg.QueryValueEx(key, "Display")[0] ! self.standardName = winreg.QueryValueEx(key, "Std")[0] ! self.daylightName = winreg.QueryValueEx(key, "Dlt")[0] self.staticInfo = WinTZI(key, "TZI") self._LoadDynamicInfoFromKey(key) *************** *** 251,255 **** def _LoadDynamicInfoFromKey(self, key): try: ! dkey = _winreg.OpenKeyEx(key, 'Dynamic DST') except WindowsError: return --- 251,255 ---- def _LoadDynamicInfoFromKey(self, key): try: ! dkey = winreg.OpenKeyEx(key, 'Dynamic DST') except WindowsError: return *************** *** 257,262 **** del info['FirstEntry'] del info['LastEntry'] ! years = map(int, info.keys()) ! values = map(WinTZI, info.values()) # create a range mapping that searches by descending year and matches # if the target year is greater or equal. --- 257,262 ---- del info['FirstEntry'] del info['LastEntry'] ! years = map(int, list(info.keys())) ! values = map(WinTZI, list(info.values())) # create a range mapping that searches by descending year and matches # if the target year is greater or equal. *************** *** 347,353 **** def _get_time_zone_key(subkey=None): "Return the registry key that stores time zone details" ! key = _winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, TimeZoneInfo.tzRegKey) if subkey: ! key = _winreg.OpenKeyEx(key, subkey) return key _get_time_zone_key = staticmethod(_get_time_zone_key) --- 347,353 ---- def _get_time_zone_key(subkey=None): "Return the registry key that stores time zone details" ! key = winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, TimeZoneInfo.tzRegKey) if subkey: ! key = winreg.OpenKeyEx(key, subkey) return key _get_time_zone_key = staticmethod(_get_time_zone_key) *************** *** 365,369 **** def get_index_value(key_name): key = TimeZoneInfo._get_time_zone_key(key_name) ! value, type = _winreg.QueryValueEx(key, index_key) return value values = map(get_index_value, key_names) --- 365,369 ---- def get_index_value(key_name): key = TimeZoneInfo._get_time_zone_key(key_name) ! value, type = winreg.QueryValueEx(key, index_key) return value values = map(get_index_value, key_names) *************** *** 397,404 **** def _RegKeyEnumerator(key): ! return _RegEnumerator(key, _winreg.EnumKey) def _RegValueEnumerator(key): ! return _RegEnumerator(key, _winreg.EnumValue) def _RegEnumerator(key, func): --- 397,404 ---- def _RegKeyEnumerator(key): ! return _RegEnumerator(key, winreg.EnumKey) def _RegValueEnumerator(key): ! return _RegEnumerator(key, winreg.EnumValue) def _RegEnumerator(key, func): *************** *** 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 --- 414,418 ---- values = _RegValueEnumerator(key) values = tuple(values) ! return dict(map(lambda (name,value,type): (name,value), values)) # for backward compatibility *************** *** 455,459 **** """ tzRegKey = r'SYSTEM\CurrentControlSet\Control\TimeZoneInformation' ! key = _winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKey) local = _RegKeyDict(key) # if the user has not checked "Automatically adjust clock for daylight --- 455,459 ---- """ tzRegKey = r'SYSTEM\CurrentControlSet\Control\TimeZoneInformation' ! key = winreg.OpenKeyEx(_winreg.HKEY_LOCAL_MACHINE, tzRegKey) local = _RegKeyDict(key) # if the user has not checked "Automatically adjust clock for daylight |
