[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla bindings.py, 1.8, 1.9

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11062/Pythonwin/pywin/scintilla

Modified Files:
	bindings.py 
Log Message:
remove workaround for old py3k bug

Index: bindings.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/bindings.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** bindings.py	11 Dec 2008 05:02:54 -0000	1.8
--- bindings.py	4 Jan 2009 22:37:36 -0000	1.9
***************
*** 148,155 ****
  					rc = 1
  		except:
- 			# ??? - hrm - py3k might want:
- 			# traceback.print_exc(chain=False)
- 			# but why?  We do a normal print_exc() below (and py2k
- 			# doesn't have that param.
  			message = "Firing event '%s' failed." % event
  			print message
--- 148,151 ----

[pywin32-checkins] pywin32/com/win32com/test testPyComTest.py, 1.41, 1.42

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10927/test

Modified Files:
	testPyComTest.py 
Log Message:
Use py3k friendly way of getting a long int for testing

Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** testPyComTest.py	19 Dec 2008 01:52:35 -0000	1.41
--- testPyComTest.py	4 Jan 2009 22:35:44 -0000	1.42
***************
*** 3,10 ****
  
  import sys; sys.coinit_flags=0 # Must be free-threaded!
! import win32api, types, pythoncom, time
  import sys, os, win32com, win32com.client.connect
  from win32com.test.util import CheckClean
! from win32com.client import constants
  import win32com
  from win32com.test.util import RegisterPythonServer
--- 3,10 ----
  
  import sys; sys.coinit_flags=0 # Must be free-threaded!
! import win32api, pythoncom, time
  import sys, os, win32com, win32com.client.connect
  from win32com.test.util import CheckClean
! from win32com.client import constants, DispatchBaseClass
  import win32com
  from win32com.test.util import RegisterPythonServer
***************
*** 33,36 ****
--- 33,45 ----
  verbose = 0
  
+ # convert a normal int to a long int - used to avoid, eg, '1L' for py3k
+ # friendliness
+ def ensure_long(int_val):
+     if sys.version_info > (3,):
+         # py3k - no such thing as a 'long'
+         return int_val
+     # on py2x, we just use an expression that results in a long
+     return 0x100000000-0x100000000+int_val
+ 
  def progress(*args):
      if verbose:
***************
*** 180,184 ****
  
      i1, i2 = o.GetMultipleInterfaces()
!     if type(i1) != types.InstanceType or type(i2) != types.InstanceType:
          # Yay - is now an instance returned!
          raise error("GetMultipleInterfaces did not return instances - got '%s', '%s'" % (i1, i2))
--- 189,193 ----
  
      i1, i2 = o.GetMultipleInterfaces()
!     if not isinstance(i1, DispatchBaseClass) or not isinstance(i2, DispatchBaseClass):
          # Yay - is now an instance returned!
          raise error("GetMultipleInterfaces did not return instances - got '%s', '%s'" % (i1, i2))
***************
*** 212,216 ****
          raise error("GetSetUnknown failed")
      progress("Checking getting/passing IDispatch")
!     if type(o.GetSetDispatch(o)) !=types.InstanceType:
          raise error("GetSetDispatch failed")
      progress("Checking getting/passing IDispatch of known type")
--- 221,225 ----
          raise error("GetSetUnknown failed")
      progress("Checking getting/passing IDispatch")
!     if not isinstance(o.GetSetDispatch(o), DispatchBaseClass):
          raise error("GetSetDispatch failed")
      progress("Checking getting/passing IDispatch of known type")
***************
*** 223,227 ****
      if o.GetSetVariant(o) != o:
          raise error("GetSetVariant (dispatch) failed")
!     for l in sys.maxint, sys.maxint+1, 1 << 65L:
          if o.GetSetVariant(l) != l:
              raise error("GetSetVariant (long) failed")
--- 232,239 ----
      if o.GetSetVariant(o) != o:
          raise error("GetSetVariant (dispatch) failed")
!     # We want to explicitly test > 32 bits.  py3k has no 'maxint' and
!     # 'maxsize+1' is no good on 64bit platforms as its 65 bits!
!     big = 2147483647 # sys.maxint on py2k
!     for l in big, big+1, 1 << 65:
          if o.GetSetVariant(l) != l:
              raise error("GetSetVariant (long) failed")
***************
*** 271,278 ****
      TestApplyResult(o.Test6, (constants.WideAttr5,), constants.WideAttr5)
  
!     TestConstant("ULongTest1", 0xFFFFFFFFL)
!     TestConstant("ULongTest2", 0x7FFFFFFFL)
!     TestConstant("LongTest1", -0x7FFFFFFFL)
!     TestConstant("LongTest2", 0x7FFFFFFFL)
      TestConstant("UCharTest", 255)
      TestConstant("CharTest", -1)
--- 283,290 ----
      TestApplyResult(o.Test6, (constants.WideAttr5,), constants.WideAttr5)
  
!     TestConstant("ULongTest1", ensure_long(0xFFFFFFFF))
!     TestConstant("ULongTest2", ensure_long(0x7FFFFFFF))
!     TestConstant("LongTest1", ensure_long(-0x7FFFFFFF))
!     TestConstant("LongTest2", ensure_long(0x7FFFFFFF))
      TestConstant("UCharTest", 255)
      TestConstant("CharTest", -1)

[pywin32-checkins] pywin32/com/win32com/client __init__.py, 1.38, 1.39 combrowse.py, 1.13, 1.14 dynamic.py, 1.27, 1.28

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10882/client

Modified Files:
	__init__.py combrowse.py dynamic.py 
Log Message:
add __eq__ method for rich comparisons for py3k

Index: combrowse.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/combrowse.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** combrowse.py	11 Dec 2008 06:54:52 -0000	1.13
--- combrowse.py	4 Jan 2009 22:35:14 -0000	1.14
***************
*** 37,40 ****
--- 37,42 ----
      def __cmp__(self, other):
          return cmp(self.name, other.name)
+     def __eq__(self, other):
+         return self.name==other.name
  
  class HLICOM(browser.HLIPythonObject):

Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dynamic.py	4 Dec 2008 03:18:32 -0000	1.27
--- dynamic.py	4 Jan 2009 22:35:14 -0000	1.28
***************
*** 204,207 ****
--- 204,211 ----
  		return cmp(self._oleobj_, other)
  
+ 	def __eq__(self, other):
+ 		other = getattr(other, "_oleobj_", other)
+ 		return self._oleobj_ == other
+ 
  	def __int__(self):
  		return int(self.__call__())

Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/__init__.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** __init__.py	4 Dec 2008 03:18:32 -0000	1.38
--- __init__.py	4 Jan 2009 22:35:14 -0000	1.39
***************
*** 448,451 ****
--- 448,455 ----
  		return cmp(self._oleobj_, other)
  
+ 	def __eq__(self, other):
+ 		other = getattr(other, "_oleobj_", other)
+ 		return self._oleobj_ == other
+ 
  	def _ApplyTypes_(self, dispid, wFlags, retType, argTypes, user, resultCLSID, *args):
  		return self._get_good_object_(

[pywin32-checkins] pywin32/com/win32com readme.htm,1.16,1.17

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10799

Modified Files:
	readme.htm 
Log Message:
fix typo

Index: readme.htm
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/readme.htm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** readme.htm	13 Nov 2008 04:04:51 -0000	1.16
--- readme.htm	4 Jan 2009 22:34:08 -0000	1.17
***************
*** 50,54 ****
  <h3>Recent Changes</h3>
  
! <h4>Lost of internal changes on the road to py3k</h4>
  
  <h4>win32com.axcontrol and win2con.internet</h4>
--- 50,54 ----
  <h3>Recent Changes</h3>
  
! <h4>Lots of internal changes on the road to py3k</h4>
  
  <h4>win32com.axcontrol and win2con.internet</h4>

[pywin32-checkins] pywin32/com/win32comext/axscript/client error.py, 1.11, 1.12

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25667/com/win32comext/axscript/client

Modified Files:
	error.py 
Log Message:
Fix activescript exception handling on py3k

Index: error.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/client/error.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** error.py	27 Nov 2008 03:53:25 -0000	1.11
--- error.py	4 Jan 2009 13:45:02 -0000	1.12
***************
*** 164,184 ****
  			bits.extend(traceback.format_exception_only(exc_type, value))
  
! 		# XXX - this block appears completely bogus???  The UTF8
! 		# comment below is from well before py3k, so utf8 doesn't have
! 		# any special status in py2k.  Most likely is that this was
! 		# simply an artifact of an invalid test (which remains - it
! 		# raises a RuntimeError with a *string* with extended
! 		# characters.)
! 		# Sadly, the test still fails in the same way if you raise a
! 		# Unicode string with an extended char.  This block keeps the
! 		# tests passing, so it remains.
! 		# XXX - todo - read the above, and fix below!
! 
! 		# all items in the list are utf8 courtesy of Python magically
! 		# converting unicode to utf8 before compilation.
! 		for i in xrange(len(bits)):
! 			if type(bits[i]) is str:
! 			#assert type(bits[i]) is str, type(bits[i])
! 				bits[i] = bits[i].decode('utf8')
  
  		self.description = ExpandTabs(u''.join(bits))
--- 164,181 ----
  			bits.extend(traceback.format_exception_only(exc_type, value))
  
! 		# XXX - this utf8 encoding seems bogus.  From well before py3k,
! 		# we had the comment:
! 		# > all items in the list are utf8 courtesy of Python magically
! 		# > converting unicode to utf8 before compilation.
! 		# but that is likely just confusion from early unicode days;
! 		# Python isn't doing it, pywin32 probably was, so 'mbcs' would
! 		# be the default encoding.  We should never hit this these days
! 		# anyway, but on py3k, we *never* will, and str objects there
! 		# don't have a decode method...
! 		if sys.version_info < (3,):
! 			for i in xrange(len(bits)):
! 				if type(bits[i]) is str:
! 				#assert type(bits[i]) is str, type(bits[i])
! 					bits[i] = bits[i].decode('utf8')
  
  		self.description = ExpandTabs(u''.join(bits))

[pywin32-checkins] pywin32/SWIG/swig_lib/python pywintypes.i, 1.7, 1.8

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/SWIG/swig_lib/python
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25615/SWIG/swig_lib/python

Modified Files:
	pywintypes.i 
Log Message:
rationalize header order for swig generated files

Index: pywintypes.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/SWIG/swig_lib/python/pywintypes.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pywintypes.i	3 Jun 2007 14:53:06 -0000	1.7
--- pywintypes.i	4 Jan 2009 13:44:19 -0000	1.8
***************
*** 36,45 ****
  
  %{
- #include "windows.h"
- #include "winbase.h"
  #include "PyWinTypes.h"
  #ifdef NEED_PYWINOBJECTS_H
  #include "PyWinObjects.h"
  #endif
  #include "tchar.h"
  %}
--- 36,44 ----
  
  %{
  #include "PyWinTypes.h"
  #ifdef NEED_PYWINOBJECTS_H
  #include "PyWinObjects.h"
  #endif
+ #include "winbase.h"
  #include "tchar.h"
  %}

[pywin32-checkins] pywin32/com/win32com/client build.py,1.35,1.36

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25552/com/win32com/client

Modified Files:
	build.py 
Log Message:
handle True and False being keywords in py3k

Index: build.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/build.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** build.py	4 Dec 2008 03:18:32 -0000	1.35
--- build.py	4 Jan 2009 13:43:16 -0000	1.36
***************
*** 522,530 ****
  		return demunge_leading_underscores(className)
  	elif className == 'None':
! 		# assign to None is evil (and SyntaxError in 2.4) - note
! 		# that if it was a global it would get picked up below
  		className = 'NONE'
! 	elif iskeyword(className): # all keywords are lower case
! 		return className.capitalize()
  	elif is_global and hasattr(__builtins__, className):
  		# builtins may be mixed case.  If capitalizing it doesn't change it,
--- 522,536 ----
  		return demunge_leading_underscores(className)
  	elif className == 'None':
! 		# assign to None is evil (and SyntaxError in 2.4, even though
! 		# iskeyword says False there) - note that if it was a global
! 		# it would get picked up below
  		className = 'NONE'
! 	elif iskeyword(className):
! 		# most keywords are lower case (except True, False etc in py3k)
! 		ret = className.capitalize()
! 		# but those which aren't get forced upper.
! 		if ret == className:
! 			ret = ret.upper()
! 		return ret
  	elif is_global and hasattr(__builtins__, className):
  		# builtins may be mixed case.  If capitalizing it doesn't change it,

[pywin32-checkins] pywin32/com/win32com/src Register.cpp, 1.19, 1.20

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25490/com/win32com/src

Modified Files:
	Register.cpp 
Log Message:
ensure InterfaceNames dictionary uses strings on py3k

Index: Register.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/Register.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Register.cpp	19 Dec 2008 02:28:48 -0000	1.19
--- Register.cpp	4 Jan 2009 13:42:38 -0000	1.20
***************
*** 113,117 ****
  	// And finally in the map of names to gateway IIDs.
  	if (g_obPyCom_MapInterfaceNameToIID) {
! 		valueObject = PyString_FromString((char *)interfaceName);
  		if (!valueObject) {
  			Py_DECREF(keyObject);
--- 113,117 ----
  	// And finally in the map of names to gateway IIDs.
  	if (g_obPyCom_MapInterfaceNameToIID) {
! 		valueObject = PyWinCoreString_FromString(interfaceName);
  		if (!valueObject) {
  			Py_DECREF(keyObject);

[pywin32-checkins] pywin32/com/win32com/test testAXScript.py, 1.9, 1.10

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25435/com/win32com/test

Modified Files:
	testAXScript.py 
Log Message:
use absolute import so we work as a script and a module

Index: testAXScript.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testAXScript.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testAXScript.py	26 Nov 2008 01:23:54 -0000	1.9
--- testAXScript.py	4 Jan 2009 13:42:00 -0000	1.10
***************
*** 13,17 ****
      def setUp(self):
          file = win32api.GetFullPathName(os.path.join(win32com.axscript.client.__path__[0], "pyscript.py"))
!         from util import RegisterPythonServer
          self.verbose = verbose
          RegisterPythonServer(file, 'python', verbose=self.verbose)
--- 13,17 ----
      def setUp(self):
          file = win32api.GetFullPathName(os.path.join(win32com.axscript.client.__path__[0], "pyscript.py"))
!         from win32com.test.util import RegisterPythonServer
          self.verbose = verbose
          RegisterPythonServer(file, 'python', verbose=self.verbose)

[pywin32-checkins] pywin32/com/win32com/test testmakepy.py, 1.7, 1.8

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25388/com/win32com/test

Modified Files:
	testmakepy.py 
Log Message:
move to exception attributes

Index: testmakepy.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testmakepy.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** testmakepy.py	4 Dec 2008 03:38:20 -0000	1.7
--- testmakepy.py	4 Jan 2009 13:41:27 -0000	1.8
***************
*** 26,30 ****
              # Ignore these 2 errors, as the are very common and can obscure
              # useful warnings.
!             if details[0] not in [winerror.TYPE_E_CANTLOADLIBRARY,
                                winerror.TYPE_E_LIBNOTREGISTERED]:
                  print "** COM error on", info.desc
--- 26,30 ----
              # Ignore these 2 errors, as the are very common and can obscure
              # useful warnings.
!             if details.hresult not in [winerror.TYPE_E_CANTLOADLIBRARY,
                                winerror.TYPE_E_LIBNOTREGISTERED]:
                  print "** COM error on", info.desc

[pywin32-checkins] pywin32/com/win32comext/bits/src PyIBackgroundCopyFile2.cpp, 1.2, 1.3

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/bits/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25335/com/win32comext/bits/src

Modified Files:
	PyIBackgroundCopyFile2.cpp 
Log Message:
merge fixes to GetFileRanges from py3k branch

Index: PyIBackgroundCopyFile2.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/PyIBackgroundCopyFile2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIBackgroundCopyFile2.cpp	12 Feb 2008 00:10:57 -0000	1.2
--- PyIBackgroundCopyFile2.cpp	4 Jan 2009 13:40:54 -0000	1.3
***************
*** 32,46 ****
  	if ( pIBCF2 == NULL )
  		return NULL;
! 	DWORD * RangeCount;
! 	PyObject *obRangeCount;
! 	BG_FILE_RANGE ** Ranges;
! 	PyObject *obRanges;
  	if ( !PyArg_ParseTuple(args, ":GetFileRanges") )
  		return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pIBCF2->GetFileRanges( RangeCount, Ranges );
! 	// PyObject_FreeDWORD(RangeCount);
! 	// PyObject_FreeBG_FILE_RANGE_LIST(Ranges);
  
  	PY_INTERFACE_POSTCALL;
--- 32,42 ----
  	if ( pIBCF2 == NULL )
  		return NULL;
! 	DWORD RangeCount;
! 	BG_FILE_RANGE *Ranges;
  	if ( !PyArg_ParseTuple(args, ":GetFileRanges") )
  		return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pIBCF2->GetFileRanges( &RangeCount, &Ranges );
  
  	PY_INTERFACE_POSTCALL;
***************
*** 48,55 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIBCF2, IID_IBackgroundCopyFile2 );
- // *** The output argument RangeCount of type "DWORD *" was not processed ***
- //     The type 'DWORD *' (RangeCount) is unknown.
- // *** The output argument Ranges of type "BG_FILE_RANGE **" was not processed ***
- //     The type 'BG_FILE_RANGE **' (Ranges) is unknown.
  	Py_INCREF(Py_None);
  	return Py_None;
--- 44,47 ----

[pywin32-checkins] pywin32/Pythonwin/pywin/framework intpyapp.py, 1.15, 1.16

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19888/pywin/framework

Modified Files:
	intpyapp.py 
Log Message:
remove redundant import

Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** intpyapp.py	3 Jan 2009 05:45:36 -0000	1.15
--- intpyapp.py	4 Jan 2009 02:06:08 -0000	1.16
***************
*** 60,64 ****
  					pywin.debugger.currentDebugger.close(1)
  				except:
- 					import traceback
  					traceback.print_exc()
  				return
--- 60,63 ----

[pywin32-checkins] pywin32/Pythonwin/pywin/debugger debugger.py, 1.17.2.5, 1.17.2.6

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18427

Modified Files:
      Tag: py3k
	debugger.py 
Log Message:
Fix exception debugging in py3k and remove annoying '--Call--' print while stepping

Index: debugger.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/debugger.py,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -d -r1.17.2.5 -r1.17.2.6
*** debugger.py	27 Nov 2008 11:31:03 -0000	1.17.2.5
--- debugger.py	4 Jan 2009 01:54:09 -0000	1.17.2.6
***************
*** 580,583 ****
--- 580,588 ----
  		self.interaction(frame, None)
  
+ 	def user_call(self, frame, args):
+ 		# base class has an annoying 'print' that adds no value to us...
+ 		if self.stop_here(frame):
+ 			self.interaction(frame, None)
+ 
  	def user_exception(self, frame, exc_info):
  		# This function is called if an exception occurs,
***************
*** 587,590 ****
--- 592,607 ----
  			frame.f_locals['__exception__'] = exc_type, exc_value
  			print("Unhandled exception while debugging...")
+ 			# on both py2k and py3k, we may be called with exc_value
+ 			# being the args to the exception, or it may already be
+ 			# instantiated (IOW, PyErr_Normalize() hasn't been
+ 			# called on the args).  In py2k this is fine, but in
+ 			# py3k, traceback.print_exception fails.  So on py3k
+ 			# we instantiate an exception instance to print.
+ 			if sys.version_info > (3,) and not isinstance(exc_value, BaseException):
+ 				# they are args - may be a single item or already a tuple
+ 				if not isinstance(exc_value, tuple):
+ 					exc_value = (exc_value,)
+ 				exc_value = exc_type(*exc_value)
+ 
  			traceback.print_exception(exc_type, exc_value, exc_traceback)
  			self.interaction(frame, exc_traceback)

[pywin32-checkins] pywin32/Pythonwin/pywin/debugger debugger.py, 1.22, 1.23

[Mark Hammond <mhammond@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18367

Modified Files:
	debugger.py 
Log Message:
Fix exception debugging in py3k and remove annoying '--Call--' print while stepping

Index: debugger.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/debugger/debugger.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** debugger.py	26 Nov 2008 01:30:11 -0000	1.22
--- debugger.py	4 Jan 2009 01:53:29 -0000	1.23
***************
*** 580,583 ****
--- 580,588 ----
  		self.interaction(frame, None)
  
+ 	def user_call(self, frame, args):
+ 		# base class has an annoying 'print' that adds no value to us...
+ 		if self.stop_here(frame):
+ 			self.interaction(frame, None)
+ 
  	def user_exception(self, frame, exc_info):
  		# This function is called if an exception occurs,
***************
*** 587,590 ****
--- 592,607 ----
  			frame.f_locals['__exception__'] = exc_type, exc_value
  			print "Unhandled exception while debugging..."
+ 			# on both py2k and py3k, we may be called with exc_value
+ 			# being the args to the exception, or it may already be
+ 			# instantiated (IOW, PyErr_Normalize() hasn't been
+ 			# called on the args).  In py2k this is fine, but in
+ 			# py3k, traceback.print_exception fails.  So on py3k
+ 			# we instantiate an exception instance to print.
+ 			if sys.version_info > (3,) and not isinstance(exc_value, BaseException):
+ 				# they are args - may be a single item or already a tuple
+ 				if not isinstance(exc_value, tuple):
+ 					exc_value = (exc_value,)
+ 				exc_value = exc_type(*exc_value)
+ 
  			traceback.print_exception(exc_type, exc_value, exc_traceback)
  			self.interaction(frame, exc_traceback)