[Python-checkins] python/dist/src/Mac/Tools/IDE PyEdit.py,1.41,1.42

jvr@users.sourceforge.net jvr@users.sourceforge.net
Fri, 09 May 2003 01:34:01 -0700


Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1:/tmp/cvs-serv3414

Modified Files:
	PyEdit.py 
Log Message:
more dead code removal

Index: PyEdit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PyEdit.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** PyEdit.py	9 May 2003 08:27:33 -0000	1.41
--- PyEdit.py	9 May 2003 08:33:58 -0000	1.42
***************
*** 109,114 ****
  		self.run_with_interpreter = self.settings.get("run_with_interpreter", 0)
  		self.run_with_cl_interpreter = self.settings.get("run_with_cl_interpreter", 0)
- 		self._threadstate = (0, 0)
- 		self._thread = None
  	
  	def readwindowsettings(self):
--- 109,112 ----
***************
*** 507,519 ****
  	
  	def run(self):
! 		if self._threadstate == (0, 0):
! 			self._run()
! 		else:
! 			lock = Wthreading.Lock()
! 			lock.acquire()
! 			self._thread.postException(KeyboardInterrupt)
! 			if self._thread.isBlocked():
! 				self._thread.start()
! 			lock.release()
  	
  	def _run(self):
--- 505,509 ----
  	
  	def run(self):
! 		self._run()
  	
  	def _run(self):
***************
*** 566,577 ****
  	
  	def runselection(self):
! 		if self._threadstate == (0, 0):
! 			self._runselection()
! 		elif self._threadstate == (1, 1):
! 			self._thread.block()
! 			self.setthreadstate((1, 2))
! 		elif self._threadstate == (1, 2):
! 			self._thread.start()
! 			self.setthreadstate((1, 1))
  	
  	def _runselection(self):
--- 556,560 ----
  	
  	def runselection(self):
! 		self._runselection()
  	
  	def _runselection(self):
***************
*** 625,641 ****
  			klass.__dict__.update(globals[classname].__dict__)
  			globals[classname] = klass
- 	
- 	def setthreadstate(self, state):
- 		oldstate = self._threadstate
- 		if oldstate[0] <> state[0]:
- 			self.runbutton.settitle(runButtonLabels[state[0]])
- 		if oldstate[1] <> state[1]:
- 			self.runselbutton.settitle(runSelButtonLabels[state[1]])
- 		self._threadstate = state
- 	
- 	def _exec_threadwrapper(self, *args, **kwargs):
- 		apply(execstring, args, kwargs)
- 		self.setthreadstate((0, 0))
- 		self._thread = None
  	
  	def execstring(self, pytext, globals, locals, file, modname):
--- 608,611 ----