Make load.py more idiomatic.

[zzz-pokedex.git] / pokedex / db / __init__.py

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index a6c8f6e..aa540a2 100644 (file)
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -2,7 +2,7 @@ from sqlalchemy import MetaData, Table, engine_from_config, orm
 
 from ..defaults import get_default_db_uri
 from .tables import metadata
-from .multilang import MultilangSession
+from .multilang import MultilangSession, MultilangScopedSession
 
 
 def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
@@ -21,7 +21,7 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
         uri = get_default_db_uri()
 
     ### Do some fixery for MySQL
-    if uri[0:5] == 'mysql':
+    if uri.startswith('mysql:'):
         # MySQL uses latin1 for connections by default even if the server is
         # otherwise oozing with utf8; charset fixes this
         if 'charset' not in uri:
@@ -42,6 +42,6 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
     all_session_args = dict(autoflush=True, autocommit=False, bind=engine)
     all_session_args.update(session_args)
     sm = orm.sessionmaker(class_=MultilangSession, **all_session_args)
-    session = orm.scoped_session(sm)
+    session = MultilangScopedSession(sm)
 
     return session