fix: Allow unicode strings for DSN under Py2

untitaker · untitaker · commit ee55ec1c8662 · 2019-06-28T18:29:41.000+02:00
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -33,7 +33,7 @@
 
 def _get_options(*args, **kwargs):
     # type: (*Optional[str], **Any) -> Dict[str, Any]
-    if args and (isinstance(args[0], str) or args[0] is None):
+    if args and (isinstance(args[0], (text_type, bytes, str)) or args[0] is None):
         dsn = args[0]  # type: Optional[str]
         args = args[1:]
     else:
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -659,3 +659,23 @@ def __repr__(self):
     exception, = event["exception"]["values"]
     frame, = exception["stacktrace"]["frames"]
     assert frame["vars"]["environ"] == {"a": "<This is me>"}
+
+
+@pytest.mark.parametrize(
+    "dsn",
+    [
+        "http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2",
+        u"http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2",
+    ],
+)
+def test_init_string_types(dsn, sentry_init):
+    # Allow unicode strings on Python 3 and both on Python 2 (due to
+    # unicode_literals)
+    #
+    # Supporting bytes on Python 3 is not really wrong but probably would be
+    # extra code
+    sentry_init(dsn)
+    assert (
+        Hub.current.client.dsn
+        == "http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2"
+    )
