From cd8c6dee64d237461c81623bb2e366fc32aac81d Mon Sep 17 00:00:00 2001
From: David Cramer <dcramer@gmail.com>
Date: Sun, 12 Jul 2015 08:55:41 -0600
Subject: [PATCH] Fix various py3 compatibility (refs GH-625)

---
 raven/contrib/django/models.py | 2 +-
 raven/contrib/flask.py         | 3 ++-
 raven/utils/imports.py         | 2 --
 tests/contrib/django/tests.py  | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/raven/contrib/django/models.py b/raven/contrib/django/models.py
index e53536cf..2927bb92 100644
--- a/raven/contrib/django/models.py
+++ b/raven/contrib/django/models.py
@@ -142,7 +142,7 @@ def get_client(client=None, reset=False):
         options.setdefault('release', ga('RELEASE'))
 
         transport = ga('TRANSPORT') or options.get('transport')
-        if isinstance(transport, basestring):
+        if isinstance(transport, six.string_types):
             transport = import_string(transport)
         options['transport'] = transport
 
diff --git a/raven/contrib/flask.py b/raven/contrib/flask.py
index 05f0067c..ed09af23 100644
--- a/raven/contrib/flask.py
+++ b/raven/contrib/flask.py
@@ -27,6 +27,7 @@ from raven.conf import setup_logging
 from raven.base import Client
 from raven.middleware import Sentry as SentryMiddleware
 from raven.handlers.logging import SentryHandler
+from raven.utils import six
 from raven.utils.compat import _urlparse
 from raven.utils.imports import import_string
 from raven.utils.wsgi import get_headers, get_environ
@@ -36,7 +37,7 @@ def make_client(client_cls, app, dsn=None):
     # TODO(dcramer): django and Flask share very similar concepts here, and
     # should be refactored
     transport = app.config.get('SENTRY_TRANSPORT')
-    if isinstance(transport, basestring):
+    if isinstance(transport, six.string_types):
         transport = import_string(transport)
 
     return client_cls(
diff --git a/raven/utils/imports.py b/raven/utils/imports.py
index e039a287..2884f756 100644
--- a/raven/utils/imports.py
+++ b/raven/utils/imports.py
@@ -2,8 +2,6 @@ from __future__ import absolute_import
 
 
 def import_string(key):
-    key = str(key)
-
     if '.' not in key:
         return __import__(key)
 
diff --git a/tests/contrib/django/tests.py b/tests/contrib/django/tests.py
index 6d9b80b0..0d3703c5 100644
--- a/tests/contrib/django/tests.py
+++ b/tests/contrib/django/tests.py
@@ -2,7 +2,6 @@
 
 from __future__ import absolute_import
 from __future__ import with_statement
-from __future__ import unicode_literals
 
 import datetime
 import django
@@ -716,7 +715,7 @@ class PromiseSerializerTestCase(TestCase):
         assert result == expected
 
     def test_real_gettext_lazy(self):
-        d = {'lazy_translation': gettext_lazy('testing')}
+        d = {u'lazy_translation': gettext_lazy(u'testing')}
         key = "'lazy_translation'" if six.PY3 else "u'lazy_translation'"
         value = "'testing'" if six.PY3 else "u'testing'"
         assert transform(d) == {key: value}