From c04235a5d11fd7704b6210334be7b0ee567df272 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Thu, 7 May 2020 10:53:45 -0400 Subject: [PATCH] Fix some code and lints --- ...8807ea_add_cascading_delete_to_dynamic_.py | 9 +++--- CTFd/plugins/migrations.py | 32 ++++++++----------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/CTFd/plugins/dynamic_challenges/migrations/b37fb68807ea_add_cascading_delete_to_dynamic_.py b/CTFd/plugins/dynamic_challenges/migrations/b37fb68807ea_add_cascading_delete_to_dynamic_.py index 2db3f9a5..6b4a35fc 100644 --- a/CTFd/plugins/dynamic_challenges/migrations/b37fb68807ea_add_cascading_delete_to_dynamic_.py +++ b/CTFd/plugins/dynamic_challenges/migrations/b37fb68807ea_add_cascading_delete_to_dynamic_.py @@ -1,13 +1,10 @@ """Add cascading delete to dynamic challenges Revision ID: b37fb68807ea -Revises: 1093835a1051 +Revises: Create Date: 2020-05-06 12:21:39.373983 """ -from alembic import op - - # revision identifiers, used by Alembic. revision = "b37fb68807ea" down_revision = None @@ -17,7 +14,9 @@ depends_on = None def upgrade(op=None): # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint("dynamic_challenge_ibfk_1", "dynamic_challenge", type_="foreignkey") + op.drop_constraint( + "dynamic_challenge_ibfk_1", "dynamic_challenge", type_="foreignkey" + ) op.create_foreign_key( None, "dynamic_challenge", "challenges", ["id"], ["id"], ondelete="CASCADE" ) diff --git a/CTFd/plugins/migrations.py b/CTFd/plugins/migrations.py index 5393da35..1cf28f65 100644 --- a/CTFd/plugins/migrations.py +++ b/CTFd/plugins/migrations.py @@ -1,20 +1,15 @@ -import os - -from alembic.migration import MigrationContext -from flask import current_app -from flask_migrate import Migrate, stamp -from sqlalchemy import create_engine -from alembic.operations import Operations - -from alembic.script import ScriptDirectory -from alembic.config import Config -from sqlalchemy import pool - -from CTFd.utils import get_config, set_config - import inspect import os +from alembic.config import Config +from alembic.migration import MigrationContext +from alembic.operations import Operations +from alembic.script import ScriptDirectory +from flask import current_app +from sqlalchemy import create_engine, pool + +from CTFd.utils import get_config, set_config + def upgrade(plugin_name=None): database_url = current_app.config.get("SQLALCHEMY_DATABASE_URI") @@ -24,12 +19,13 @@ def upgrade(plugin_name=None): if plugin_name is None: # Get the directory name of the plugin if unspecified - caller_path = inspect.stack()[1].filename + # Doing it this way doesn't waste the rest of the inspect.stack call + frame = inspect.currentframe() + caller_info = inspect.getframeinfo(frame.f_back) + caller_path = caller_info[0] plugin_name = os.path.basename(os.path.dirname(caller_path)) - engine = create_engine( - database_url, poolclass=pool.NullPool - ) + engine = create_engine(database_url, poolclass=pool.NullPool) conn = engine.connect() context = MigrationContext.configure(conn) op = Operations(context)