Skip to content

Commit 3c2f2bf

Browse files
fixing linting
1 parent efe884e commit 3c2f2bf

6 files changed

Lines changed: 282 additions & 178 deletions

File tree

CTFd/plugins/LuaUtils/__init__.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
import difflib
12
import functools
3+
import os
4+
5+
from flask import current_app, url_for
6+
27
from CTFd.cache import cache
38
from CTFd.utils import _get_asset_json, get_asset_json, get_config, set_config
49
from CTFd.utils.helpers import markup
5-
from flask import current_app,url_for
6-
import os
10+
711

812
def load(app):
913
cache.delete_memoized(_get_asset_json)
@@ -100,12 +104,10 @@ def run_after_route(app,key,function):
100104
delete_user_decorator = run_as_decorator(function,True)
101105
app.view_functions[key] = delete_user_decorator(app.view_functions[key])
102106

103-
import difflib
104-
105107
# https://stackoverflow.com/a/61107079
106108
def merge_text(text1:str, text2:str) -> str:
107109
return "\n".join(
108110
line[2:] for line in difflib.Differ().compare(
109111
text1.split("\n"),
110-
text2.split("\n"))
111-
if not line.startswith("?"))
112+
text2.split("\n"))
113+
if not line.startswith("?"))

CTFd/plugins/MapeFlag/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from CTFd.plugins import register_plugin_assets_directory
2-
from CTFd.plugins.flags import BaseFlag, FlagException, FLAG_CLASSES
2+
from CTFd.plugins.flags import FLAG_CLASSES, BaseFlag, FlagException
3+
34

45
class CTFdMAPEFlag(BaseFlag):
56
name = "mape"

CTFd/plugins/MaxapeFlag/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
from CTFd.plugins import register_plugin_assets_directory
3-
from CTFd.plugins.flags import BaseFlag,FlagException,FLAG_CLASSES
3+
from CTFd.plugins.flags import FLAG_CLASSES, BaseFlag, FlagException
44

55

66
class CTFdMAXAPEFlag(BaseFlag):

CTFd/plugins/ModifyError404ChallengesPage/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import functools
22
from pathlib import Path
3+
4+
from flask import abort, redirect, request, url_for
5+
36
from CTFd.constants.config import ChallengeVisibilityTypes
47
from CTFd.models import Configs
8+
from CTFd.utils import config
9+
from CTFd.utils import user as current_user
510
from CTFd.utils.dates import ctf_ended, ctf_paused, ctf_started, ctftime, view_after_ctf
6-
from CTFd.utils import config, user as current_user
711
from CTFd.utils.decorators import require_complete_profile, require_verified_emails
812
from CTFd.utils.decorators.visibility import check_challenge_visibility
913
from CTFd.utils.helpers import get_errors, get_infos
1014
from CTFd.utils.plugins import override_template
11-
from flask import url_for, redirect,request, abort
1215

1316

1417
def during_ctf_time_only(f):

0 commit comments

Comments
 (0)