Don't barf on Session(info=...) from sessionmaker(info=None)

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 0c3bc5cbe4fedc5f7811a0243ef528c6ffd50c8a..d6fc5baea1d1939781f197088ded075ba3d21aea 100644 (file)
--- 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 34b0c7effa0262771c93f4e49e6a07a065490b71..4eb498ee901cab18b35f2145d0a5db2de11f850a 100644 (file)
--- 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):