Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4678/com/win32comext/axdebug
Modified Files:
Tag: py3k
adb.py contexts.py documents.py expressions.py stackframe.py
Log Message:
many more py3k syntax improvements thanks to 2to3
Index: adb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/adb.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** adb.py 4 Dec 2008 05:04:32 -0000 1.6.2.2
--- adb.py 4 Dec 2008 07:32:05 -0000 1.6.2.3
***************
*** 8,12 ****
import axdebug, stackframe
import win32api, pythoncom
! import thread, os
def fnull(*args):
--- 8,12 ----
import axdebug, stackframe
import win32api, pythoncom
! import _thread, os
def fnull(*args):
***************
*** 73,77 ****
self.recursiveData = [] # Data saved for each reentery on this thread.
bdb.Bdb.__init__(self)
! self._threadprotectlock = thread.allocate_lock()
self.reset()
--- 73,77 ----
self.recursiveData = [] # Data saved for each reentery on this thread.
bdb.Bdb.__init__(self)
! self._threadprotectlock = _thread.allocate_lock()
self.reset()
Index: expressions.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/expressions.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
*** expressions.py 26 Nov 2008 09:03:29 -0000 1.5.4.1
--- expressions.py 4 Dec 2008 07:32:06 -0000 1.5.4.2
***************
*** 1,5 ****
import axdebug, gateways
! from util import _wrap, _wrap_remove, RaiseNotImpl
! import cStringIO, traceback
from pprint import pprint
from win32com.server.exception import COMException
--- 1,5 ----
import axdebug, gateways
! from .util import _wrap, _wrap_remove, RaiseNotImpl
! import io, traceback
from pprint import pprint
from win32com.server.exception import COMException
***************
*** 10,14 ****
# Given an object, return a nice string
def MakeNiceString(ob):
! stream = cStringIO.StringIO()
pprint(ob, stream)
return string.strip(stream.getvalue())
--- 10,14 ----
# Given an object, return a nice string
def MakeNiceString(ob):
! stream = io.StringIO()
pprint(ob, stream)
return string.strip(stream.getvalue())
Index: contexts.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/contexts.py,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** contexts.py 18 Jun 2006 13:18:26 -0000 1.2
--- contexts.py 4 Dec 2008 07:32:05 -0000 1.2.4.1
***************
*** 6,11 ****
# Utility function for wrapping object created by this module.
! from util import _wrap, _wrap_remove, trace
! import adb
class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext):
--- 6,11 ----
# Utility function for wrapping object created by this module.
! from .util import _wrap, _wrap_remove, trace
! from . import adb
class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext):
Index: documents.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/documents.py,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** documents.py 26 Nov 2008 09:03:29 -0000 1.2.4.1
--- documents.py 4 Dec 2008 07:32:06 -0000 1.2.4.2
***************
*** 4,11 ****
import axdebug, gateways
import pythoncom
! from util import _wrap, _wrap_remove, RaiseNotImpl, trace
from win32com.server.util import unwrap
! import codecontainer
! import contexts
from win32com.server.exception import Exception
import win32api, winerror, os, string, sys
--- 4,11 ----
import axdebug, gateways
import pythoncom
! from .util import _wrap, _wrap_remove, RaiseNotImpl, trace
from win32com.server.util import unwrap
! from . import codecontainer
! from . import contexts
from win32com.server.exception import Exception
import win32api, winerror, os, string, sys
Index: stackframe.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/stackframe.py,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** stackframe.py 26 Nov 2008 09:03:29 -0000 1.4.4.1
--- stackframe.py 4 Dec 2008 07:32:06 -0000 1.4.4.2
***************
*** 4,14 ****
"""
import sys
! from util import _wrap, RaiseNotImpl
import expressions, gateways, axdebug, winerror
import pythoncom
from win32com.server.exception import COMException
- import repr, string
! from util import trace
#def trace(*args):
# pass
--- 4,13 ----
"""
import sys
! from .util import _wrap, RaiseNotImpl
import expressions, gateways, axdebug, winerror
import pythoncom
from win32com.server.exception import COMException
! from .util import trace
#def trace(*args):
# pass
***************
*** 140,144 ****
def EnumMembers(self, dwFieldSpec, nRadix, iid):
print("EnumMembers", dwFieldSpec, nRadix, iid)
! import expressions
return expressions.MakeEnumDebugProperty(self.frame.f_locals, dwFieldSpec, nRadix, iid, self.frame)
--- 139,143 ----
def EnumMembers(self, dwFieldSpec, nRadix, iid):
print("EnumMembers", dwFieldSpec, nRadix, iid)
! from . import expressions
return expressions.MakeEnumDebugProperty(self.frame.f_locals, dwFieldSpec, nRadix, iid, self.frame)
|
