From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 19 Nov 2013 19:21:20 +0000 (-0500)
Subject: Added support for new :attr:`.Session.info` attribute to
X-Git-Tag: rel_0_9_0~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=452ce0c2e7fae13a569341cbbe6f3a988c0c6360;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Added support for new :attr:`.Session.info` attribute to
:class:`.scoped_session`.
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 5eaf78b9d1..0427741ccb 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,12 @@
 .. changelog::
     :version: 0.9.0b2
 
+    .. change::
+        :tags: bug, orm
+
+        Added support for new :attr:`.Session.info` attribute to
+        :class:`.scoped_session`.
+
     .. change::
         :tags: removed
 
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 6393b74a77..8d9ab319a5 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -163,7 +163,7 @@ def makeprop(name):
     return property(get, set)
 
 for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map',
-             'is_active', 'autoflush', 'no_autoflush'):
+             'is_active', 'autoflush', 'no_autoflush', 'info'):
     setattr(scoped_session, prop, makeprop(prop))