Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8245/Pythonwin/pywin/debugger
Modified Files:
Tag: py3k
__init__.py dbgcon.py
Log Message:
merge various py3k friendly changes from the trunk.
Index: dbgcon.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/dbgcon.py,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** dbgcon.py 29 Aug 2008 06:16:41 -0000 1.1.4.1
--- dbgcon.py 23 Oct 2008 09:45:16 -0000 1.1.4.2
***************
*** 25,28 ****
def SaveDebuggerOptions(opts):
! for key, val in list(opts.items()):
win32ui.WriteProfileVal("Debugger Options", key, val)
--- 25,28 ----
def SaveDebuggerOptions(opts):
! for key, val in opts.iteritems():
win32ui.WriteProfileVal("Debugger Options", key, val)
Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/__init__.py,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -d -r1.5.4.1 -r1.5.4.2
*** __init__.py 29 Aug 2008 06:16:41 -0000 1.5.4.1
--- __init__.py 23 Oct 2008 09:45:16 -0000 1.5.4.2
***************
*** 13,17 ****
if isInprocApp:
# MAY Need it - may already have one
! need = ("pywin.debugger.dbgpyapp" in sys.modules)==0
else:
need = 0
--- 13,17 ----
if isInprocApp:
# MAY Need it - may already have one
! need = "pywin.debugger.dbgpyapp" not in sys.modules
else:
need = 0
|