aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Gareth Coles <[email protected]>2018-03-30 10:19:16 +0100
committerGravatar Gareth Coles <[email protected]>2018-03-30 10:19:16 +0100
commit4aa6a98945e25a01d37546bf393a2bc5e540f0a8 (patch)
tree6b56cd1a0ab753a9769a8cf6d3bc42262818bdea
parentStaff page typo (diff)
Change to PyCharm imports
-rw-r--r--pysite/__init__.py2
-rw-r--r--pysite/decorators.py1
-rw-r--r--pysite/mixins.py3
-rw-r--r--pysite/oauth.py1
-rw-r--r--pysite/views/main/info/resources.py1
-rw-r--r--pysite/views/tests/index.py1
-rw-r--r--tox.ini2
7 files changed, 5 insertions, 6 deletions
diff --git a/pysite/__init__.py b/pysite/__init__.py
index cc80b075..9aed2f66 100644
--- a/pysite/__init__.py
+++ b/pysite/__init__.py
@@ -1,9 +1,9 @@
# coding=utf-8
import logging
import os
+import sys
from logging import StreamHandler
from logging.handlers import SysLogHandler
-import sys
from logmatic import JsonFormatter
diff --git a/pysite/decorators.py b/pysite/decorators.py
index afab259a..447c17e4 100644
--- a/pysite/decorators.py
+++ b/pysite/decorators.py
@@ -2,6 +2,7 @@
import os
from functools import wraps
from json import JSONDecodeError
+from typing import List
from flask import request
from schema import Schema, SchemaError
diff --git a/pysite/mixins.py b/pysite/mixins.py
index 5b1a780f..cfebae88 100644
--- a/pysite/mixins.py
+++ b/pysite/mixins.py
@@ -1,7 +1,8 @@
# coding=utf-8
+from _weakref import ref
+
from flask import Blueprint
from rethinkdb.ast import Table
-from _weakref import ref
from pysite.database import RethinkDB
diff --git a/pysite/oauth.py b/pysite/oauth.py
index d5a3a15a..ef86aa8a 100644
--- a/pysite/oauth.py
+++ b/pysite/oauth.py
@@ -5,7 +5,6 @@ from flask import session
from flask_dance.consumer.backend import BaseBackend
from flask_dance.contrib.discord import discord
-
from pysite.constants import DISCORD_API_ENDPOINT, OAUTH_DATABASE
diff --git a/pysite/views/main/info/resources.py b/pysite/views/main/info/resources.py
index f3ff8283..ceb88b65 100644
--- a/pysite/views/main/info/resources.py
+++ b/pysite/views/main/info/resources.py
@@ -4,7 +4,6 @@ from logging import getLogger
from pysite.base_route import RouteView
-
try:
with open("static/resources.json") as fh:
categories = json.load(fh)
diff --git a/pysite/views/tests/index.py b/pysite/views/tests/index.py
index 2a55a112..3071bf0e 100644
--- a/pysite/views/tests/index.py
+++ b/pysite/views/tests/index.py
@@ -7,7 +7,6 @@ from pysite.base_route import RouteView
from pysite.constants import ValidationTypes
from pysite.decorators import api_params
-
SCHEMA = Schema([{"test": str}])
REQUIRED_KEYS = ["test"]
diff --git a/tox.ini b/tox.ini
index 26d06d9c..42abe576 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,4 +3,4 @@ max-line-length=120
application_import_names=pysite
ignore=P102
exclude=__pycache__, venv, app_test.py
-import-order-style=pep8 \ No newline at end of file
+import-order-style=pycharm \ No newline at end of file