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

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32com/makegw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7664

Modified Files:
	makegw.py 
Log Message:
Have makegw use the correct error handlers.


Index: makegw.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/makegw/makegw.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makegw.py	6 Oct 2003 13:07:02 -0000	1.7
--- makegw.py	26 Jan 2005 22:29:49 -0000	1.8
***************
*** 390,394 ****
              f.write('// *** The input argument %s of type "%s" was not processed ***\n//   - Please ensure this conversion function exists, and is appropriate\n//   - %s\n' % (arg.name, arg.raw_type, why))
              f.write('\tPyObject *ob%s = PyObject_From%s(%s);\n' % (arg.name, arg.type, arg.name))
!             f.write('\tif (ob%s==NULL) return PyCom_HandlePythonFailureToCOM();\n' % arg.name)
              codePost = codePost + "\tPy_DECREF(ob%s);\n" % arg.name
              formatChars = formatChars + "O"
--- 390,394 ----
              f.write('// *** The input argument %s of type "%s" was not processed ***\n//   - Please ensure this conversion function exists, and is appropriate\n//   - %s\n' % (arg.name, arg.raw_type, why))
              f.write('\tPyObject *ob%s = PyObject_From%s(%s);\n' % (arg.name, arg.type, arg.name))
!             f.write('\tif (ob%s==NULL) return MAKE_PYCOM_GATEWAY_FAILURE_CODE("%s");\n' % (arg.name, method.name))
              codePost = codePost + "\tPy_DECREF(ob%s);\n" % arg.name
              formatChars = formatChars + "O"
***************
*** 439,447 ****
            parseFn = "PyArg_ParseTuple"
          if codePobjects: f.write(codePobjects)
!         f.write('\tif (!%s(result, "%s" %s)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);\n' % (parseFn, formatChars, argsParseTuple))
        if codePost: 
          f.write('\tBOOL bPythonIsHappy = TRUE;\n')
          f.write(codePost)
!         f.write('\tif (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);\n')
        f.write('\tPy_DECREF(result);\n');
      f.write('\treturn hr;\n}\n\n')
--- 439,447 ----
            parseFn = "PyArg_ParseTuple"
          if codePobjects: f.write(codePobjects)
!         f.write('\tif (!%s(result, "%s" %s))\n\t\treturn MAKE_PYCOM_GATEWAY_FAILURE_CODE("%s");\n' % (parseFn, formatChars, argsParseTuple, method.name))
        if codePost: 
          f.write('\tBOOL bPythonIsHappy = TRUE;\n')
          f.write(codePost)
!         f.write('\tif (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("%s");\n' % method.name)
        f.write('\tPy_DECREF(result);\n');
      f.write('\treturn hr;\n}\n\n')