Update of /cvsroot/pywin32/pywin32/com/win32comext/adsi/demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29773/com/win32comext/adsi/demos
Modified Files:
Tag: py3k
scp.py
Log Message:
merge more .py changes from the trunk (via 2to3)
Index: scp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/adsi/demos/scp.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
*** scp.py 26 Nov 2008 09:03:29 -0000 1.3.4.1
--- scp.py 11 Dec 2008 05:45:21 -0000 1.3.4.2
***************
*** 43,47 ****
import optparse, textwrap
import traceback
- import types
verbose = 1
--- 43,46 ----
***************
*** 198,202 ****
operation, # Add, replace, or delete SPNs
):
! assert spns not in types.StringTypes and hasattr(spns, "__iter__"), \
"spns must be a sequence of strings (got %r)" % spns
# Bind to a domain controller.
--- 197,201 ----
operation, # Add, replace, or delete SPNs
):
! assert type(spns) not in [str, str] and hasattr(spns, "__iter__"), \
"spns must be a sequence of strings (got %r)" % spns
# Bind to a domain controller.
|
