From 61ecedc305f0503e6d273bae375a0a254008f66c Mon Sep 17 00:00:00 2001 From: Italo Maia Date: Thu, 22 Jun 2017 21:46:01 -0300 Subject: [PATCH] py3 compatibility urljoin was moved to urllib.parse --- flask_oauth.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/flask_oauth.py b/flask_oauth.py index b21105a..d5f8224 100644 --- a/flask_oauth.py +++ b/flask_oauth.py @@ -10,7 +10,12 @@ """ import httplib2 from functools import wraps -from urlparse import urljoin + +try: + from urlparse import urljoin +except ImportError: + from urllib.parse import urljoin + from flask import request, session, json, redirect, Response from werkzeug import url_decode, url_encode, url_quote, \ parse_options_header, Headers