summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py2
-rw-r--r--pyramid/scaffolds/alchemy/+package+/tests.py_tmpl6
2 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
index 4f9711d93..0b2a42c59 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
+++ b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
@@ -9,7 +9,7 @@ from pyramid.paster import (
from pyramid.scripts.common import parse_vars
-from ..models.meta import (
+from ..models import (
Base,
get_session,
get_engine,
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 963377b78..01f2cb4cc 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -13,10 +13,10 @@ class BaseTest(unittest.TestCase):
self.config = testing.setUp(settings={
'sqlalchemy.url': 'sqlite:///:memory:'
})
- self.config.include('.models.meta')
+ self.config.include('.models')
settings = self.config.get_settings()
- from .models.meta import (
+ from .models import (
get_session,
get_engine,
get_dbmaker,
@@ -28,7 +28,7 @@ class BaseTest(unittest.TestCase):
self.session = get_session(transaction.manager, dbmaker)
def init_database(self):
- from .models.meta import Base
+ from .models import Base
Base.metadata.create_all(self.engine)
def tearDown(self):