From 1cd3d4602862d75ed264fc02082fb2ac27d11e9c Mon Sep 17 00:00:00 2001 From: Nicolas Azrak Date: Mon, 26 Dec 2016 16:07:19 -0300 Subject: [PATCH] Support python 3 --- flask_oauth.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flask_oauth.py b/flask_oauth.py index b21105a..98d68d4 100644 --- a/flask_oauth.py +++ b/flask_oauth.py @@ -10,7 +10,10 @@ """ import httplib2 from functools import wraps -from urlparse import urljoin +try: + from urllib.parse import urljoin +except ImportError: + from urlparse import urljoin from flask import request, session, json, redirect, Response from werkzeug import url_decode, url_encode, url_quote, \ parse_options_header, Headers