From: Michael Trier <mtrier@gmail.com>
Date: Sat, 4 Apr 2009 02:39:23 +0000 (+0000)
Subject: Corrected examples in ORM tutorial to specify actual exception being thrown. Fixes... 
X-Git-Tag: rel_0_5_4~35
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7f1e6621f8d856d9487e93df9baf2ada49bc4cae;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Corrected examples in ORM tutorial to specify actual exception being thrown. Fixes 1365.
---

diff --git a/doc/build/ormtutorial.rst b/doc/build/ormtutorial.rst
index b0d547bc9b..d4bc3e5ea3 100644
--- a/doc/build/ormtutorial.rst
+++ b/doc/build/ormtutorial.rst
@@ -501,9 +501,10 @@ The ``all()``, ``one()``, and ``first()`` methods of ``Query`` immediately issue
 
 .. sourcecode:: python+sql
 
-    {sql}>>> try: #doctest: +NORMALIZE_WHITESPACE
+    {sql}>>> from sqlalchemy.orm.exc import MultipleResultsFound
+    >>> try: #doctest: +NORMALIZE_WHITESPACE
     ...     user = query.one()
-    ... except Exception, e:
+    ... except MultipleResultsFound, e:
     ...     print e
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
     FROM users
@@ -514,9 +515,10 @@ The ``all()``, ``one()``, and ``first()`` methods of ``Query`` immediately issue
 
 .. sourcecode:: python+sql
 
-    {sql}>>> try: #doctest: +NORMALIZE_WHITESPACE
+    {sql}>>> from sqlalchemy.orm.exc import NoResultFound
+    >>> try: #doctest: +NORMALIZE_WHITESPACE
     ...     user = query.filter(User.id == 99).one()
-    ... except Exception, e:
+    ... except NoResultFound, e:
     ...     print e
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
     FROM users