[Zope-Checkins] CVS: Zope/lib/python/Products/ZopeTutorial - TutorialTopic.py:1.14.38.2

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/Products/ZopeTutorial
In directory cvs.zope.org:/tmp/cvs-serv16574/lib/python/Products/ZopeTutorial

Modified Files:
      Tag: Zope-2_7-branch
	TutorialTopic.py 
Log Message:
 - Merge tseaver-strexp_delenda-branch to the 2.7 branch.


=== Zope/lib/python/Products/ZopeTutorial/TutorialTopic.py 1.14.38.1 => 1.14.38.2 ===
--- Zope/lib/python/Products/ZopeTutorial/TutorialTopic.py:1.14.38.1	Tue Nov  4 16:18:02 2003
+++ Zope/lib/python/Products/ZopeTutorial/TutorialTopic.py	Mon Nov 17 17:34:15 2003
@@ -18,6 +18,8 @@
 import StructuredText
 import  re
 
+from zExceptions import BadRequest
+
 
 pre_pat=re.compile(r'<PRE>(.+?)</PRE>', re.IGNORECASE|re.DOTALL)
 tutorialExamplesFile='ZopeTutorialExamples.zexp'
@@ -160,7 +162,7 @@
         from Products.ZGadflyDA.DA import data_sources
         data_sources()
     except:
-        raise 'Bad Request', 'The ZGadflyDA product must be installed!'
+        raise BadRequest, 'The ZGadflyDA product must be installed!'
 
     # work around old Zope bug in importing
     try: