From dd56ca9bfca26445611ea77b30279a03d5a39252 Mon Sep 17 00:00:00 2001
From: Ben Busby <benbusby@protonmail.com>
Date: Thu, 17 Dec 2020 15:09:33 -0500
Subject: [PATCH] PEP-8: pep8 -> pycodestyle, fix __init__

---
 app/__init__.py  | 33 ++++++++++++++++++++++++---------
 requirements.txt |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index a349acc..dccc85d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -6,20 +6,35 @@ from flask_session import Session
 import os
 from stem import Signal
 
-app = Flask(__name__, static_folder=os.path.dirname(os.path.abspath(__file__)) + '/static')
+app = Flask(__name__, static_folder=os.path.dirname(
+    os.path.abspath(__file__)) + '/static')
 app.user_elements = {}
 app.default_key_set = generate_user_keys()
 app.no_cookie_ips = []
 app.config['SECRET_KEY'] = os.urandom(32)
 app.config['SESSION_TYPE'] = 'filesystem'
 app.config['VERSION_NUMBER'] = '0.2.1'
-app.config['APP_ROOT'] = os.getenv('APP_ROOT', os.path.dirname(os.path.abspath(__file__)))
-app.config['STATIC_FOLDER'] = os.getenv('STATIC_FOLDER', os.path.join(app.config['APP_ROOT'], 'static'))
-app.config['CONFIG_PATH'] = os.getenv('CONFIG_VOLUME', os.path.join(app.config['STATIC_FOLDER'], 'config'))
-app.config['DEFAULT_CONFIG'] = os.path.join(app.config['CONFIG_PATH'], 'config.json')
-app.config['SESSION_FILE_DIR'] = os.path.join(app.config['CONFIG_PATH'], 'session')
-app.config['BANG_PATH'] = os.getenv('CONFIG_VOLUME', os.path.join(app.config['STATIC_FOLDER'], 'bangs'))
-app.config['BANG_FILE'] = os.path.join(app.config['BANG_PATH'], 'bangs.json')
+app.config['APP_ROOT'] = os.getenv(
+    'APP_ROOT',
+    os.path.dirname(os.path.abspath(__file__)))
+app.config['STATIC_FOLDER'] = os.getenv(
+    'STATIC_FOLDER',
+    os.path.join(app.config['APP_ROOT'], 'static'))
+app.config['CONFIG_PATH'] = os.getenv(
+    'CONFIG_VOLUME',
+    os.path.join(app.config['STATIC_FOLDER'], 'config'))
+app.config['DEFAULT_CONFIG'] = os.path.join(
+    app.config['CONFIG_PATH'],
+    'config.json')
+app.config['SESSION_FILE_DIR'] = os.path.join(
+    app.config['CONFIG_PATH'],
+    'session')
+app.config['BANG_PATH'] = os.getenv(
+    'CONFIG_VOLUME',
+    os.path.join(app.config['STATIC_FOLDER'], 'bangs'))
+app.config['BANG_FILE'] = os.path.join(
+    app.config['BANG_PATH'],
+    'bangs.json')
 
 if not os.path.exists(app.config['CONFIG_PATH']):
     os.makedirs(app.config['CONFIG_PATH'])
@@ -38,4 +53,4 @@ Session(app)
 # Attempt to acquire tor identity, to determine if Tor config is available
 send_tor_signal(Signal.HEARTBEAT)
 
-from app import routes
+from app import routes  # noqa
diff --git a/requirements.txt b/requirements.txt
index 7dfa434..399d342 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,9 +16,9 @@ lxml==4.5.1
 MarkupSafe==1.1.1
 more-itertools==8.3.0
 packaging==20.4
-pep8==1.7.1
 pluggy==0.13.1
 py==1.8.1
+pycodestyle==2.6.0
 pycparser==2.19
 pyOpenSSL==19.1.0
 pyparsing==2.4.7