python3

fargo/fargo/views.py

@@ -1,4 +1,3 @@
-import urllib
 import logging
 from json import dumps
 from copy import deepcopy
@@ -16,6 +15,7 @@ from django.contrib import messages
 from django.contrib.auth import get_user_model, REDIRECT_FIELD_NAME
 from django.contrib.auth import logout as auth_logout
 from django.contrib.auth import views as auth_views
+from django.utils.http import quote
 from django.utils.translation import ugettext as _
 from django.utils.decorators import method_decorator
 from django.conf import settings
@@ -254,7 +254,7 @@ def login(request, *args, **kwargs):
         if not 'next' in request.GET:
             return HttpResponseRedirect(resolve_url('mellon_login'))
         return HttpResponseRedirect(resolve_url('mellon_login') + '?next='
-                                    + urllib.quote(request.GET.get('next')))
+                                    + quote(request.GET.get('next')))
     return auth_views.login(request, *args, **kwargs)
 
 

fargo/oauth2/authentication.py

@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import urlparse
 import logging
 
 import requests
 
 from django.conf import settings
 
+from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.translation import ugettext_lazy as _
 
 from rest_framework.authentication import BasicAuthentication

fargo/oauth2/utils.py

@@ -1,6 +1,6 @@
 import cgi
-from urllib import unquote
 
+from django.utils.http import unquote
 from django.utils.timezone import now
 from django.conf import settings
 

fargo/oauth2/views.py

@@ -16,8 +16,7 @@
 
 import logging
 
-from urllib import quote
-
+from django.utils.http import quote
 from django.utils.translation import ugettext as _
 from django.utils.timezone import now
 from django.core.files.base import ContentFile

fargo/settings.py

@@ -242,4 +242,4 @@ local_settings_file = os.environ.get('FARGO_SETTINGS_FILE',
                                          'local_settings.py'))
 
 if os.path.exists(local_settings_file):
-    execfile(local_settings_file)
+    exec(open(local_settings_file).read())

fargo/utils.py

@@ -1,5 +1,5 @@
-import urlparse
 from django.utils.http import urlencode
+from django.utils.six.moves.urllib import parse as urlparse
 
 
 def make_url(__url, **kwargs):