Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29642/com/win32com/test
Modified Files:
util.py
Log Message:
use py3k-friendly imports
Index: util.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/util.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** util.py 26 Nov 2008 08:52:32 -0000 1.13
--- util.py 4 Dec 2008 05:23:49 -0000 1.14
***************
*** 1,4 ****
import sys, os
- import _winreg
import win32api
import tempfile
--- 1,3 ----
***************
*** 7,14 ****
import pythoncom
import winerror
- import cStringIO as StringIO
from pythoncom import _GetInterfaceCount, _GetGatewayCount
import win32com
import logging
def CheckClean():
--- 6,19 ----
import pythoncom
import winerror
from pythoncom import _GetInterfaceCount, _GetGatewayCount
import win32com
import logging
+ try: # try py2x imports first
+ import _winreg
+ import cStringIO as StringIO
+ except ImportError:
+ # py3k imports
+ import winreg as _winreg
+ import io as StringIO
def CheckClean():
|
