From 9e7ca474cd82dd68e363587e4d43f2442cbae297 Mon Sep 17 00:00:00 2001 From: Nicholas Charriere Date: Sun, 6 May 2018 15:07:01 -0700 Subject: [PATCH] py2 and py3 support --- snappass/main.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/snappass/main.py b/snappass/main.py index 9a51308..204090c 100644 --- a/snappass/main.py +++ b/snappass/main.py @@ -1,7 +1,11 @@ import os import re import sys -import urllib +# Support python2 and python3 quote import +try: + from urllib import quote, unquote +except ImportError: + from urllib.parse import quote, unquote import uuid import redis @@ -166,7 +170,7 @@ def handle_password(): base_url = request.url_root else: base_url = request.url_root.replace("http://", "https://") - link = base_url + urllib.quote(token) + link = base_url + quote(token) return render_template('confirm.html', password_link=link) @@ -174,7 +178,7 @@ def handle_password(): def show_password(password_key): if not request_is_valid(request): abort(404) - password_key = urllib.unquote(password_key) + password_key = unquote(password_key) password = get_password(password_key) if not password: abort(404)