heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various style issues

Browse Source 
Sorry, cannot look at them without urge to fix
This commit is contained in:
Boris Bobrov 2015-11-01 09:26:39 +09:00 committed by Christopher Allan Webber
parent 9bc8c8709d
commit 8da8c0ac2d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mediagoblin/gmg_commands/dbupdate.py
View File

@ -48,6 +48,8 @@ class DatabaseData(object):
def gather_database_data(plugins): def gather_database_data(plugins):
""" """
Gather all database data relevant to the extensions installed.
Gather all database data relevant to the extensions we have Gather all database data relevant to the extensions we have
installed so we can do migrations and table initialization. installed so we can do migrations and table initialization.
@ -74,8 +76,8 @@ def gather_database_data(plugins):
models = [] models = []
except AttributeError as exc: except AttributeError as exc:
_log.warning('Could not find MODELS in {0}.models, have you \ _log.warning('Could not find MODELS in {0}.models, have you '
forgotten to add it? ({1})'.format(plugin, exc)) 'forgotten to add it? ({1})'.format(plugin, exc))
models = [] models = []
try: try:
@ -88,12 +90,13 @@ forgotten to add it? ({1})'.format(plugin, exc))
migrations = {} migrations = {}
except AttributeError as exc: except AttributeError as exc:
_log.debug('Could not find MIGRATIONS in {0}.migrations, have you \ _log.debug('Could not find MIGRATIONS in {0}.migrations, have you'
forgotten to add it? ({1})'.format(plugin, exc)) 'forgotten to add it? ({1})'.format(plugin, exc))
migrations = {} migrations = {}
try: try:
foundations = import_component('{0}.models:FOUNDATIONS'.format(plugin)) foundations = import_component(
'{0}.models:FOUNDATIONS'.format(plugin))
except ImportError as exc: except ImportError as exc:
foundations = {} foundations = {}
except AttributeError as exc: except AttributeError as exc:
@ -101,14 +104,13 @@ forgotten to add it? ({1})'.format(plugin, exc))
if models: if models:
managed_dbdata.append( managed_dbdata.append(
DatabaseData(plugin, models, foundations, migrations)) DatabaseData(plugin, models, foundations, migrations))
return managed_dbdata return managed_dbdata
def run_alembic_migrations(db, app_config, global_config): def run_alembic_migrations(db, app_config, global_config):
"""Initializes a database and runs all Alembic migrations.""" """Initialize a database and runs all Alembic migrations."""
Session = sessionmaker(bind=db.engine) Session = sessionmaker(bind=db.engine)
manager = AlembicMigrationManager(Session()) manager = AlembicMigrationManager(Session())
manager.init_or_migrate() manager.init_or_migrate()
@ -121,7 +123,6 @@ def run_dbupdate(app_config, global_config):
Will also initialize or migrate all extensions (media types, and Will also initialize or migrate all extensions (media types, and
in the future, plugins) in the future, plugins)
""" """
# Set up the database # Set up the database
db = setup_connection_and_db_from_config(app_config, migrations=True) db = setup_connection_and_db_from_config(app_config, migrations=True)
# Run the migrations # Run the migrations
@ -134,7 +135,8 @@ def run_dbupdate(app_config, global_config):
def run_all_migrations(db, app_config, global_config): def run_all_migrations(db, app_config, global_config):
""" """Initialize or migrates a database.
Initializes or migrates a database that already has a Initializes or migrates a database that already has a
connection setup and also initializes or migrates all connection setup and also initializes or migrates all
extensions based on the config files. extensions based on the config files.
@ -144,7 +146,7 @@ def run_all_migrations(db, app_config, global_config):
""" """
# Gather information from all media managers / projects # Gather information from all media managers / projects
dbdatas = gather_database_data( dbdatas = gather_database_data(
list(global_config.get('plugins', {}).keys())) list(global_config.get('plugins', {}).keys()))
Session = sessionmaker(bind=db.engine) Session = sessionmaker(bind=db.engine)