From be6b65dc555e7c4f3e262efda541fc1d1120808c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tudur=C3=AD=20marctc=40gmail=2Ecom?= Date: Thu, 6 Nov 2014 09:15:54 +0100 Subject: [PATCH 1/2] modified utils.py in order to work properly with python2 and python3 --- rest_auth/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_auth/utils.py b/rest_auth/utils.py index eb61bd7..5c36b6b 100644 --- a/rest_auth/utils.py +++ b/rest_auth/utils.py @@ -1,3 +1,4 @@ +from six import string_types from django.utils.importlib import import_module @@ -5,7 +6,7 @@ def import_callable(path_or_callable): if hasattr(path_or_callable, '__call__'): return path_or_callable else: - assert isinstance(path_or_callable, (str, unicode)) + assert isinstance(path_or_callable, string_types) package, attr = path_or_callable.rsplit('.', 1) return getattr(import_module(package), attr) From a47083824d70b8b34a5b4717a25a14261f05906b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tudur=C3=AD=20marctc=40gmail=2Ecom?= Date: Thu, 6 Nov 2014 09:18:44 +0100 Subject: [PATCH 2/2] added python3 and django 1.7.1 support in travis.yml --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88dc35e..e7767e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,14 +2,16 @@ language: python python: - "2.6" - "2.7" + - "3.3" + - "3.4" env: - DJANGO=1.5.10 - DJANGO=1.6.7 - - DJANGO=1.7 + - DJANGO=1.7.1 matrix: exclude: - python: "2.6" - env: DJANGO=1.7 + env: DJANGO=1.7.1 install: - pip install -q Django==$DJANGO --use-mirrors - pip install coveralls