From fd2c8cc08733ccf3ed72948443e409b6a5ad40c6 Mon Sep 17 00:00:00 2001 From: Alexey Salnikov Date: Tue, 27 Oct 2015 09:09:14 +0300 Subject: [PATCH] Fix import urlparse for 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..dc10875 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 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