Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3631/Pythonwin/pywin/framework
Modified Files:
Tag: py3k
interact.py intpyapp.py
Log Message:
merge various fixes and changes from the trunk
Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -C2 -d -r1.11.2.5 -r1.11.2.6
*** intpyapp.py 4 Dec 2008 07:28:46 -0000 1.11.2.5
--- intpyapp.py 6 Dec 2008 01:48:26 -0000 1.11.2.6
***************
*** 158,163 ****
return 1
except:
! win32ui.MessageBox("There was an error in the DDE conversation with Pythonwin")
! traceback.print_exc()
def InitInstance(self):
--- 158,164 ----
return 1
except:
! # It is too early to 'print' an exception - we
! # don't have stdout setup yet!
! win32ui.DisplayTraceback(sys.exc_info(), " - error in DDE conversation with Pythonwin")
def InitInstance(self):
***************
*** 248,252 ****
elif argType=="/rundlg":
if dde:
! dde.Exec("import scriptutils;scriptutils.RunScript('%s', '%s', 1)" % (args[argStart], ' '.join(args[argStart+1:])))
else:
from . import scriptutils
--- 249,253 ----
elif argType=="/rundlg":
if dde:
! dde.Exec("from pywin.framework import scriptutils;scriptutils.RunScript('%s', '%s', 1)" % (args[argStart], ' '.join(args[argStart+1:])))
else:
from . import scriptutils
***************
*** 254,258 ****
elif argType=="/run":
if dde:
! dde.Exec("import scriptutils;scriptutils.RunScript('%s', '%s', 0)" % (args[argStart], ' '.join(args[argStart+1:])))
else:
from . import scriptutils
--- 255,259 ----
elif argType=="/run":
if dde:
! dde.Exec("from pywin.framework import scriptutils;scriptutils.RunScript('%s', '%s', 0)" % (args[argStart], ' '.join(args[argStart+1:])))
else:
from . import scriptutils
***************
*** 270,278 ****
raise TypeError("Command line arguments not recognised")
except:
! typ, val, tb = sys.exc_info()
! print("There was an error processing the command line args")
! traceback.print_exception(typ, val, tb, None, sys.stdout)
! win32ui.OutputDebug("There was a problem with the command line args - %s: %s" % (repr(typ),repr(val)))
! tb = None # Prevent a cycle
--- 271,276 ----
raise TypeError("Command line arguments not recognised")
except:
! # too early for print anything.
! win32ui.DisplayTraceback(sys.exc_info(), " - error processing command line args")
Index: interact.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/interact.py,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -d -r1.17.2.2 -r1.17.2.3
*** interact.py 27 Nov 2008 11:31:03 -0000 1.17.2.2
--- interact.py 6 Dec 2008 01:48:26 -0000 1.17.2.3
***************
*** 443,446 ****
--- 443,452 ----
#
def ProcessEnterEvent(self, event ):
+ #If autocompletion has been triggered, complete and do not process event
+ if self.SCIAutoCActive():
+ self.SCIAutoCComplete()
+ self.SCICancel()
+ return
+
self.SCICancel()
# First, check for an error message
|
