Calling Application._quit() is now preferred over raising self.

jackjansen · jackjansen · commit ef5cd05c3d68 · 1996-09-17T12:39:12.000Z
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -47,7 +47,7 @@ def makeusermenus(self):
 		self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
 	
 	def quit(self, *args):
-		raise self
+		self._quit()
 		
 	def showPICT(self, resid):
 		w = PICTwindow(self)
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -51,7 +51,7 @@ def makeusermenus(self):
 		self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
 	
 	def quit(self, *args):
-		raise self
+		self._quit()
 		
 	def showPICT(self, resid):
 		w = PICTwindow(self)
diff --git a/Mac/Demo/cgi.html b/Mac/Demo/cgi.html
@@ -30,11 +30,6 @@ <h2>AppleEvent servers</h2>
 MiniApplication is a tiny replacement for <code>FrameWork.Application</code>,
 suitable if your application does not need windows and such. 
 
-<blockquote>Actually, Framework.Application has a problem for AE Servers,
-due to the way it expects to be quit through an exception, and raising an exception
-while inside an Apple Event handler is a very bad idea. This will be fixed.
-</blockquote>
-
 AEServer is a bit of glue that does part of the appleevent decoding for you. You
 call <code>installaehandler</code> passing it the class and id (4-char strings)
 of the event you have a handler for and the handler callback routine. When the
@@ -45,7 +40,7 @@ <h2>AppleEvent servers</h2>
 
 You can test AEServer by double-clicking it. It will react to the standard
 run/open/print/quit OSA commands. If it is running as a normal python script and you
-drag a file onto the interpreter the script will tell you what event is got. <p>
+drag a file onto the interpreter the script will tell you what event it got. <p>
 
 <h2>A Minimal CGI script</h2>
 
diff --git a/Mac/Demo/example2.html b/Mac/Demo/example2.html
@@ -85,8 +85,8 @@ <H2>A modeless dialog application using FrameWork</H2>
 menu bar and the main event loop and event dispatching. In the
 <CODE>__init__</CODE> routine we first let the base class initialize
 itself, then we create our modeless dialog and finally we jump into
-the main loop. The main loop continues until <CODE>self</CODE> is
-raised, which we will do when the user selects "quit". When we create
+the main loop. The main loop continues until we call <CODE>self._quit</CODE>,
+which we will do when the user selects "quit". When we create
 the instance of <CODE>MyDialog</CODE> (which inherits
 <CODE>DialogWindow</CODE>, which inherits <CODE>Window</CODE>) we pass
 a reference to the application object, this reference is used to tell
@@ -97,8 +97,8 @@ <H2>A modeless dialog application using FrameWork</H2>
 The <CODE>makeusermenus()</CODE> method (which is called sometime
 during the Application <CODE>__init__</CODE> routine) creates a File
 menu with a Quit command (shortcut command-Q), which will callback to
-our quit() method. <CODE>Quit()</CODE>, in turn, raises 'self' which
-causes the mainloop to terminate. <p>
+our quit() method. <CODE>Quit()</CODE>, in turn, calls <CODE>_quit</CODE> which
+causes the mainloop to terminate at a convenient time. <p>
 
 Application provides a standard about box, but we override this by
 providing our own <CODE>do_about()</CODE> method which shows an about
diff --git a/Mac/Demo/example2/InterslipControl-2.py b/Mac/Demo/example2/InterslipControl-2.py
@@ -51,7 +51,7 @@ def makeusermenus(self):
 		self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
 	
 	def quit(self, *args):
-		raise self
+		self._quit()
 		
 	def do_about(self, *args):
 		f = Dlg.GetNewDialog(ID_ABOUT, -1)
diff --git a/Mac/Demo/imgbrowse/imgbrowse.py b/Mac/Demo/imgbrowse/imgbrowse.py
@@ -81,7 +81,7 @@ def makeusermenus(self):
 		self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
 	
 	def quit(self, *args):
-		raise self
+		self._quit()
 		
 	def opendoc(self, *args):
 		fss, ok = macfs.StandardGetFile() # Any file type
diff --git a/Mac/Demo/textedit.html b/Mac/Demo/textedit.html
@@ -108,8 +108,7 @@ <H2>A sample text editor</H2>
 
 Oh yes: the <code>quit</code> callback does a little magic too. It closes all windows, and only if this
 succeeds it actually quits. This gives the user a chance to cancel the operation if some files are unsaved.
-Quitting itself is also a bit strange: you raise <code>self</code> to break out of the main loop. This bit
-of idiom was invented by Guido, so blame him:-). <p>
+<p>
 
 Lastly, there is the <code>idle</code> method, called by the Application base class when no event
 is available. It is forwarded to the active window, so it can blink the text caret. <p>
diff --git a/Mac/Demo/textedit/ped.py b/Mac/Demo/textedit/ped.py
@@ -295,7 +295,7 @@ def quit(self, *args):
 			w.close()
 		if self._windows:
 			return
-		raise self
+		self._quit()
 		
 	#
 	# Edit menu
diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
@@ -730,7 +730,7 @@ def quit(self, *args):
 			w.close()
 		if self._windows:
 			return
-		raise self
+		self._quit()
 		
 	#
 	# Edit menu
diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
@@ -558,7 +558,7 @@ def quit(self, *args):
 			w.close()
 		if self._windows:
 			return
-		raise self
+		self._quit()
 		
 	#
 	# Edit menu
diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
@@ -368,7 +368,7 @@ def quit(self, *args):
 			w.close()
 		if self._windows:
 			return
-		raise self
+		self._quit()
 		
 	#
 	# Edit menu

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ def quit(self, *args):`
`295`	`295`	`w.close()`
`296`	`296`	`if self._windows:`
`297`	`297`	`return`
`298`		`- raise self`
	`298`	`+ self._quit()`
`299`	`299`
`300`	`300`	`#`
`301`	`301`	`# Edit menu`
Original file line number	Diff line number	Diff line change
`@@ -730,7 +730,7 @@ def quit(self, *args):`
`730`	`730`	`w.close()`
`731`	`731`	`if self._windows:`
`732`	`732`	`return`
`733`		`- raise self`
	`733`	`+ self._quit()`
`734`	`734`
`735`	`735`	`#`
`736`	`736`	`# Edit menu`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ def quit(self, *args):`
`558`	`558`	`w.close()`
`559`	`559`	`if self._windows:`
`560`	`560`	`return`
`561`		`- raise self`
	`561`	`+ self._quit()`
`562`	`562`
`563`	`563`	`#`
`564`	`564`	`# Edit menu`