Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29773/com/win32com/test
Modified Files:
Tag: py3k
util.py
Log Message:
merge more .py changes from the trunk (via 2to3)
Index: util.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/util.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
*** util.py 27 Nov 2008 05:36:19 -0000 1.9.2.5
--- util.py 11 Dec 2008 05:45:21 -0000 1.9.2.6
***************
*** 1,4 ****
import sys, os
- import winreg as _winreg
import win32api
import tempfile
--- 1,3 ----
***************
*** 7,19 ****
import pythoncom
import winerror
-
- try:
- import cStringIO as StringIO
- except:
- import io as StringIO
-
from pythoncom import _GetInterfaceCount, _GetGatewayCount
import win32com
import logging
def CheckClean():
--- 6,14 ----
import pythoncom
import winerror
from pythoncom import _GetInterfaceCount, _GetGatewayCount
import win32com
import logging
+ import winreg
+ import io as StringIO
def CheckClean():
***************
*** 47,53 ****
# have a CLSID - open it.
try:
! HKCR = _winreg.HKEY_CLASSES_ROOT
! hk = _winreg.OpenKey(HKCR, "CLSID\\%s" % clsid)
! dll = _winreg.QueryValue(hk, "InprocServer32")
except WindowsError:
# no CLSID or InProcServer32 - not good!
--- 42,48 ----
# have a CLSID - open it.
try:
! HKCR = winreg.HKEY_CLASSES_ROOT
! hk = winreg.OpenKey(HKCR, "CLSID\\%s" % clsid)
! dll = winreg.QueryValue(hk, "InprocServer32")
except WindowsError:
# no CLSID or InProcServer32 - not good!
|
