From 0edacbe03712361bc19376272ba1eaa85e349bcc Mon Sep 17 00:00:00 2001 From: Nicholas Charriere Date: Sat, 22 Apr 2017 22:26:20 -0700 Subject: [PATCH] Prepare for v1.0.0 release --- setup.cfg | 10 ++++++++++ snappass/__init__.py | 1 + snappass/main.py | 16 +++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..47fba4a --- /dev/null +++ b/setup.cfg @@ -0,0 +1,10 @@ +[bumpversion] +current_version = 1.0.0 +commit = False +tag = True + +[flake8] +show-source = True +max-line-length = 120 + +[bumpversion:file:snappass/__init__.py] diff --git a/snappass/__init__.py b/snappass/__init__.py index 845eb13..2f6aaaf 100644 --- a/snappass/__init__.py +++ b/snappass/__init__.py @@ -1 +1,2 @@ __author__ = 'davedash' +__version__ = 1.0.0 diff --git a/snappass/main.py b/snappass/main.py index dee873e..8f942a5 100644 --- a/snappass/main.py +++ b/snappass/main.py @@ -9,12 +9,15 @@ from redis.exceptions import ConnectionError from flask import abort, Flask, render_template, request -SNEAKY_USER_AGENTS = ('Slackbot', 'facebookexternalhit', 'Twitterbot', 'Facebot', 'WhatsApp', 'SkypeUriPreview') +SNEAKY_USER_AGENTS = ('Slackbot', 'facebookexternalhit', 'Twitterbot', + 'Facebot', 'WhatsApp', 'SkypeUriPreview') SNEAKY_USER_AGENTS_RE = re.compile('|'.join(SNEAKY_USER_AGENTS)) NO_SSL = os.environ.get('NO_SSL', False) + + app = Flask(__name__) if os.environ.get('DEBUG'): - app.debug = True + app.debug = True app.secret_key = os.environ.get('SECRET_KEY', 'Secret Key') app.config.update( dict(STATIC_URL=os.environ.get('STATIC_URL', 'static'))) @@ -28,11 +31,7 @@ else: redis_client = redis.StrictRedis( host=redis_host, port=redis_port, db=redis_db) -time_conversion = { - 'week': 604800, - 'day': 86400, - 'hour': 3600 -} +time_conversion = {'week': 604800, 'day': 86400, 'hour': 3600} def check_redis_alive(fn): @@ -65,10 +64,12 @@ def get_password(key): redis_client.delete(key) return password + def empty(value): if not value: return True + def clean_input(): """ Make sure we're not getting bad data from the front end, @@ -86,6 +87,7 @@ def clean_input(): return time_conversion[time_period], request.form['password'] + def request_is_valid(request): """ Ensure the request validates the following: