Another py3 issue

pinax · Mar 5, 2015 · 48302e8 · 48302e8
1 parent 71f1106
commit 48302e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/pinax/teams/views.py b/pinax/teams/views.py
@@ -14,6 +14,7 @@
 from account.decorators import login_required
 from account.mixins import LoginRequiredMixin
 from account.views import SignupView
+from six import string_types
 
 from .decorators import team_required, manager_required
 from .forms import TeamInviteUserForm, TeamForm, TeamSignupForm
@@ -194,7 +195,7 @@ def team_invite(request):
     if form.is_valid():
         user_or_email = form.cleaned_data["invitee"]
         role = form.cleaned_data["role"]
-        if isinstance(user_or_email, basestring):
+        if isinstance(user_or_email, string_types):
             membership = team.invite_user(request.user, user_or_email, role)
         else:
             membership = team.add_user(user_or_email, role)

diff --git a/setup.py b/setup.py
@@ -22,19 +22,21 @@ def read(*parts):
     packages=find_packages(),
     tests_require=[
         "Django>=1.6.5",
-        "django-reversion==1.8.1",
-        "kaleo==1.5",
-        "unicode-slugify==0.1.1",
-        "Pillow==2.3.0",
-        "django-user-accounts==1.0c9"
+        "django-reversion>=1.8.1",
+        "kaleo>=1.5",
+        "unicode-slugify>=0.1.1",
+        "Pillow>=2.3.0",
+        "django-user-accounts>=1.0",
+        "six>=1.9.0"
     ],
     install_requires=[
         "Django>=1.6.5",
-        "django-reversion==1.8.1",
-        "kaleo==1.5",
-        "unicode-slugify==0.1.1",
-        "Pillow==2.3.0",
-        "django-user-accounts==1.0c9"
+        "django-reversion>=1.8.1",
+        "kaleo>=1.5",
+        "unicode-slugify>=0.1.1",
+        "Pillow>=2.3.0",
+        "django-user-accounts>=1.0",
+        "six>=1.9.0"
     ],
     test_suite="runtests.runtests",
     classifiers=[