From 1e65e52e273d28478dd6a4406922f9b76c861328 Mon Sep 17 00:00:00 2001 From: lza_menace Date: Wed, 21 Oct 2020 22:12:24 -0700 Subject: [PATCH] use consistent quotes --- xmrnodes/app.py | 21 +++++++++++---------- xmrnodes/config.example.py | 5 ++++- xmrnodes/models.py | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/xmrnodes/app.py b/xmrnodes/app.py index b0b4a0f..7957d16 100644 --- a/xmrnodes/app.py +++ b/xmrnodes/app.py @@ -11,11 +11,12 @@ from urllib.parse import urlparse from xmrnodes.helpers import determine_crypto from xmrnodes.forms import SubmitNode from xmrnodes.models import Node +from xmrnodes import config logging.basicConfig( level=logging.INFO, - format='%(asctime)s - %(levelname)s - %(message)s' + format="%(asctime)s - %(levelname)s - %(message)s" ) app = Flask(__name__) @@ -61,16 +62,16 @@ def add(): if request.method == "POST": url = request.form.get("node_url") regex = re.compile( - r'^(?:http)s?://' # http:// or https:// - r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain... - r'localhost|' #localhost... - r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip - r'(?::\d+)?' # optional port - r'(?:/?|[/?]\S+)$', re.IGNORECASE + r"^(?:http)s?://" # http:// or https:// + r"(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|" #domain... + r"localhost|" #localhost... + r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})" # ...or ip + r"(?::\d+)?" # optional port + r"(?:/?|[/?]\S+)$", re.IGNORECASE ) re_match = re.match(regex, url) if re_match is None: - flash("This doesn't look like a valid URL") + flash("This doesn\"t look like a valid URL") else: _url = urlparse(url) url = f"{_url.scheme}://{_url.netloc}" @@ -152,9 +153,9 @@ def validate(): logging.info("failed for reasons unknown") node.delete_instance() -@app.template_filter('humanize') +@app.template_filter("humanize") def humanize(d): - t = arrow.get(d, 'UTC') + t = arrow.get(d, "UTC") return t.humanize() if __name__ == "__main__": diff --git a/xmrnodes/config.example.py b/xmrnodes/config.example.py index c1199cf..7669507 100644 --- a/xmrnodes/config.example.py +++ b/xmrnodes/config.example.py @@ -1 +1,4 @@ -SECRET_KEY = 'xxxx' +import os + +SECRET_KEY = os.environ('SECRET_KEY', 'xxxx') +DATA_DIR = os.environ('DATA_DIR', './data') diff --git a/xmrnodes/models.py b/xmrnodes/models.py index b906ac2..4f6e8e5 100644 --- a/xmrnodes/models.py +++ b/xmrnodes/models.py @@ -3,7 +3,7 @@ from datetime import datetime from xmrnodes import config -data_dir = getattr(config, 'DATA_FOLDER', './data') +data_dir = getattr(config, 'DATA_DIR', './data') db = SqliteDatabase(f"{data_dir}/sqlite.db") class Node(Model):