rename dbmaker to session_factory

3 files changed, 16 insertions, 16 deletions

diff --git a/pyramid/scaffolds/alchemy/+package+/models/__init__.py b/pyramid/scaffolds/alchemy/+package+/models/__init__.py
index e55689f2c..c1ceacbf4 100644
--- a/pyramid/scaffolds/alchemy/+package+/models/__init__.py
+++ b/pyramid/scaffolds/alchemy/+package+/models/__init__.py
@@ -16,13 +16,13 @@ def get_engine(settings, prefix='sqlalchemy.'):
     return engine_from_config(settings, prefix)
 
 
-def get_sessionmaker(engine):
-    dbmaker = sessionmaker()
-    dbmaker.configure(bind=engine)
-    return dbmaker
+def get_session_factory(engine):
+    factory = sessionmaker()
+    factory.configure(bind=engine)
+    return factory
 
 
-def get_tm_session(dbmaker, transaction_manager):
+def get_tm_session(session_factory, transaction_manager):
     """
     Get a ``sqlalchemy.orm.Session`` instance backed by a transaction.
 
@@ -38,12 +38,12 @@ def get_tm_session(dbmaker, transaction_manager):
           import transaction
 
           engine = get_engine(settings)
-          dbmaker = get_sessionmaker(engine)
+          session_factory = get_session_factory(engine)
           with transaction.manager:
-              dbsession = get_tm_session(dbmaker, transaction.manager)
+              dbsession = get_tm_session(session_factory, transaction.manager)
 
     """
-    dbsession = dbmaker()
+    dbsession = session_factory()
     zope.sqlalchemy.register(
         dbsession, transaction_manager=transaction_manager)
     return dbsession
@@ -61,12 +61,12 @@ def includeme(config):
     # use pyramid_tm to hook the transaction lifecycle to the request
     config.include('pyramid_tm')
 
-    dbmaker = get_sessionmaker(get_engine(settings))
+    session_factory = get_session_factory(get_engine(settings))
 
     # make request.dbsession available for use in Pyramid
     config.add_request_method(
         # r.tm is the transaction manager used by pyramid_tm
-        lambda r: get_tm_session(dbmaker, r.tm),
+        lambda r: get_tm_session(session_factory, r.tm),
         'dbsession',
         reify=True
     )
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
index 13d4e543e..da63c180a 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
+++ b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
@@ -12,7 +12,7 @@ from pyramid.scripts.common import parse_vars
 from ..models import (
     Base,
     get_engine,
-    get_sessionmaker,
+    get_session_factory,
     get_tm_session,
     )
 from ..models import MyModel
@@ -36,10 +36,10 @@ def main(argv=sys.argv):
     engine = get_engine(settings)
     Base.metadata.create_all(engine)
 
-    dbmaker = get_sessionmaker(engine)
+    session_factory = get_session_factory(engine)
 
     with transaction.manager:
-        dbsession = get_tm_session(dbmaker, transaction.manager)
+        dbsession = get_tm_session(session_factory, transaction.manager)
 
         model = MyModel(name='one', value=1)
         dbsession.add(model)
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 4eecaf33c..be42cb5d9 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -18,14 +18,14 @@ class BaseTest(unittest.TestCase):
 
         from .models import (
             get_engine,
-            get_sessionmaker,
+            get_session_factory,
             get_tm_session,
             )
 
         self.engine = get_engine(settings)
-        dbmaker = get_sessionmaker(self.engine)
+        session_factory = get_session_factory(self.engine)
 
-        self.session = get_tm_session(dbmaker, transaction.manager)
+        self.session = get_tm_session(session_factory, transaction.manager)
 
     def init_database(self):
         from .models import Base