Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Urljoin #77

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Urljoin #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43fdeae
changing urljoin import for Python3 compatability.
Jan 11, 2016
8a4b987
adding check for Python version before importing urljoin for Python3 …
Jan 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion flask_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,21 @@
:copyright: (c) 2010 by Armin Ronacher.
:license: BSD, see LICENSE for more details.
"""
import sys
import httplib2
from functools import wraps
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
import oauth2

if (sys.version_info > (3, 0)):
# Python3 import
from urllib.parse import urljoin
else:
# Python2 import
from urlparse import urljoin


_etree = None
def get_etree():
Expand Down