Skip to content
This repository has been archived by the owner on Mar 7, 2023. It is now read-only.

Commit

Permalink
Removed p2 compatability boilerplate
Browse files Browse the repository at this point in the history
  • Loading branch information
jackieleng committed Jul 6, 2016
1 parent ae253a2 commit 0dac6fd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
7 changes: 2 additions & 5 deletions lizard_auth_server/views_api_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
"""
import logging
import json
try:
from urlparse import urljoin, urlparse
from urllib import urlencode
except ImportError:
from urllib.parse import urljoin, urlparse, urlencode
# py3 only:
from urllib.parse import urljoin, urlparse, urlencode

from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
Expand Down
21 changes: 9 additions & 12 deletions lizard_auth_server/views_sso.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

import datetime
import json
import logging
import pytz
# py3 only:
from urllib.parse import urljoin, urlparse, urlencode

from django.conf import settings
from django.core.urlresolvers import reverse
from django.http import HttpResponse
Expand All @@ -14,23 +22,12 @@
from django.views.generic.base import View
from django.views.generic.edit import FormMixin
from itsdangerous import URLSafeTimedSerializer

from lizard_auth_server import forms
from lizard_auth_server.models import Token
from lizard_auth_server.models import UserProfile
from lizard_auth_server.views import ErrorMessageResponse

import datetime
import json
import logging
import pytz


try:
from urlparse import urljoin, urlparse
from urllib import urlencode
except ImportError:
from urllib.parse import urljoin, urlparse, urlencode


logger = logging.getLogger(__name__)

Expand Down

0 comments on commit 0dac6fd

Please sign in to comment.