Lots of fixes to the code examples to specify imports explicitly.

Explicit imports make it easier for users to understand the examples.
Additionally a lot of the examples were fixed to work with the changes in the
0.5.x code base. One small correction to the Case expression.  Thanks a bunch
to Adam Lowry! Fixes #717.

3 files changed, 19 insertions, 15 deletions

diff --git a/examples/vertical/dictlike-polymorphic.py b/examples/vertical/dictlike-polymorphic.py
index 4065337c2..6180fa303 100644
--- a/examples/vertical/dictlike-polymorphic.py
+++ b/examples/vertical/dictlike-polymorphic.py
@@ -29,8 +29,8 @@ Note: Something much like 'comparable_property' is slated for inclusion in a
       future version of SQLAlchemy.
 """
 
-from sqlalchemy.orm.interfaces import PropComparator, MapperProperty
-from sqlalchemy.orm import session as sessionlib, comparable_property
+from sqlalchemy.orm.interfaces import PropComparator
+from sqlalchemy.orm import comparable_property
 
 # Using the VerticalPropertyDictMixin from the base example
 from dictlike import VerticalPropertyDictMixin
@@ -131,7 +131,9 @@ class PolymorphicVerticalProperty(object):
 
 
 if __name__ == '__main__':
-    from sqlalchemy import *
+    from sqlalchemy import (MetaData, Table, Column, Integer, Unicode,
+        ForeignKey, UnicodeText, and_, not_, or_, String, Boolean, cast, text,
+        null, case)
     from sqlalchemy.orm import mapper, relation, create_session
     from sqlalchemy.orm.collections import attribute_mapped_collection
 
@@ -198,9 +200,9 @@ if __name__ == '__main__':
     stoat[u'cuteness'] = 7
     stoat[u'weasel-like'] = True
 
-    session.save(stoat)
+    session.add(stoat)
     session.flush()
-    session.clear()
+    session.expunge_all()
 
     critter = session.query(Animal).filter(Animal.name == u'stoat').one()
     print critter[u'color']
@@ -217,14 +219,14 @@ if __name__ == '__main__':
     marten[u'cuteness'] = 5
     marten[u'weasel-like'] = True
     marten[u'poisonous'] = False
-    session.save(marten)
+    session.add(marten)
 
     shrew = Animal(u'shrew')
     shrew[u'cuteness'] = 5
     shrew[u'weasel-like'] = False
     shrew[u'poisonous'] = True
 
-    session.save(shrew)
+    session.add(shrew)
     session.flush()
 
     q = (session.query(Animal).
diff --git a/examples/vertical/dictlike.py b/examples/vertical/dictlike.py
index 5f478d7d0..1e1635ed7 100644
--- a/examples/vertical/dictlike.py
+++ b/examples/vertical/dictlike.py
@@ -122,7 +122,8 @@ class VerticalPropertyDictMixin(object):
 
 
 if __name__ == '__main__':
-    from sqlalchemy import *
+    from sqlalchemy import (MetaData, Table, Column, Integer, Unicode,
+        ForeignKey, UnicodeText, and_, not_)
     from sqlalchemy.orm import mapper, relation, create_session
     from sqlalchemy.orm.collections import attribute_mapped_collection
 
@@ -183,9 +184,9 @@ if __name__ == '__main__':
     # stoat.facts collection:
     print stoat.facts[u'color']
 
-    session.save(stoat)
+    session.add(stoat)
     session.flush()
-    session.clear()
+    session.expunge_all()
 
     critter = session.query(Animal).filter(Animal.name == u'stoat').one()
     print critter[u'color']
@@ -201,17 +202,17 @@ if __name__ == '__main__':
     marten = Animal(u'marten')
     marten[u'color'] = u'brown'
     marten[u'cuteness'] = u'somewhat'
-    session.save(marten)
+    session.add(marten)
 
     shrew = Animal(u'shrew')
     shrew[u'cuteness'] = u'somewhat'
     shrew[u'poisonous-part'] = u'saliva'
-    session.save(shrew)
+    session.add(shrew)
 
     loris = Animal(u'slow loris')
     loris[u'cuteness'] = u'fairly'
     loris[u'poisonous-part'] = u'elbows'
-    session.save(loris)
+    session.add(loris)
     session.flush()
 
     q = (session.query(Animal).
diff --git a/examples/vertical/vertical.py b/examples/vertical/vertical.py
index 6c3a61919..4a8bf7787 100644
--- a/examples/vertical/vertical.py
+++ b/examples/vertical/vertical.py
@@ -2,8 +2,9 @@
 represented in distinct database rows.  This allows objects to be created with dynamically changing
 fields that are all persisted in a normalized fashion."""
 
-from sqlalchemy import *
-from sqlalchemy.orm import *
+from sqlalchemy import (create_engine, MetaData, Table, Column, Integer, String,
+    ForeignKey, PickleType, DateTime, and_)
+from sqlalchemy.orm import mapper, relation, sessionmaker, scoped_session
 from sqlalchemy.orm.collections import mapped_collection
 import datetime