summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-11-19 14:21:20 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-11-19 14:21:20 -0500
commit452ce0c2e7fae13a569341cbbe6f3a988c0c6360 (patch)
tree26ed35b38088bbe0c1b346144a1ab56cf096deaf
parent1a809b300e0f77888e4cdac42f9e1662baa169c7 (diff)
downloadsqlalchemy-452ce0c2e7fae13a569341cbbe6f3a988c0c6360.tar.gz
Added support for new :attr:`.Session.info` attribute to
:class:`.scoped_session`.
-rw-r--r--doc/build/changelog/changelog_09.rst6
-rw-r--r--lib/sqlalchemy/orm/scoping.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 5eaf78b9d..0427741cc 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -15,6 +15,12 @@
:version: 0.9.0b2
.. change::
+ :tags: bug, orm
+
+ Added support for new :attr:`.Session.info` attribute to
+ :class:`.scoped_session`.
+
+ .. change::
:tags: removed
The "informix" and "informixdb" dialects have been removed; the code
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 6393b74a7..8d9ab319a 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))