diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-01-02 19:01:57 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-01-02 19:01:57 -0500 |
| commit | 4f7469bbc13162e6af73a89015aad9abc37f437c (patch) | |
| tree | e7be3e0a3a01becfd244575a11b67e50e0096cd2 | |
| parent | 6d3e563a575bcdc57c966980abc5038337505566 (diff) | |
| parent | f188e28aea3ba2f268888037a141f89fca66e627 (diff) | |
| download | sqlalchemy-4f7469bbc13162e6af73a89015aad9abc37f437c.tar.gz | |
Merge bitbucket.org:rschoon/sqlalchemy into t
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 3 | ||||
| -rw-r--r-- | test/orm/test_session.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 0c3bc5cbe..d6fc5baea 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -2291,7 +2291,8 @@ class sessionmaker(_SessionClassMethods): kw['autoflush'] = autoflush kw['autocommit'] = autocommit kw['expire_on_commit'] = expire_on_commit - kw['info'] = info + if info is not None: + kw['info'] = info self.kw = kw # make our own subclass of the given class, so that # events can be associated with it specifically. diff --git a/test/orm/test_session.py b/test/orm/test_session.py index 34b0c7eff..4eb498ee9 100644 --- a/test/orm/test_session.py +++ b/test/orm/test_session.py @@ -412,6 +412,10 @@ class SessionStateTest(_fixtures.FixtureTest): s3 = maker() eq_(s3.info, {"global": True, "s1": 5}) + maker2 = sessionmaker() + s4 = maker2(info={'s4': 8}) + eq_(s4.info, {'s4': 8}) + @testing.requires.independent_connections @engines.close_open_connections def test_autoflush(self): |