Fix Django client with DSN (fixes getsentryGH-58)

trbs · Feb 3, 2012 · c342c9e · c342c9e
1 parent e6b38a7
commit c342c9e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+1.3.4
+
+* Corrected duplicate DSN behavior in Django client.
+
 1.3.3
 
 * Django can now be configured by setting SENTRY_DSN.

diff --git a/raven/contrib/django/__init__.py b/raven/contrib/django/__init__.py
@@ -23,9 +23,6 @@
 class DjangoClient(Client):
     logger = logging.getLogger('sentry.errors.client.django')
 
-    def __init__(self, servers=None, **kwargs):
-        super(DjangoClient, self).__init__(servers=servers, **kwargs)
-
     def get_user_info(self, request):
         if request.user.is_authenticated():
             user_info = {

diff --git a/raven/contrib/django/models.py b/raven/contrib/django/models.py
@@ -43,7 +43,7 @@ def get_client(client=None):
     if _client[0] != client:
         module, class_name = client.rsplit('.', 1)
         instance = getattr(__import__(module, {}, {}, class_name), class_name)(
-            servers=getattr(django_settings, 'SENTRY_SERVERS', getattr(django_settings, 'SENTRY_DSN', None)),
+            servers=getattr(django_settings, 'SENTRY_SERVERS', None),
             include_paths=set(getattr(django_settings, 'SENTRY_INCLUDE_PATHS', [])) | get_installed_apps(),
             exclude_paths=getattr(django_settings, 'SENTRY_EXCLUDE_PATHS', None),
             timeout=getattr(django_settings, 'SENTRY_TIMEOUT', None),

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
 
 setup(
     name='raven',
-    version='1.3.3',
+    version='1.3.4',
     author='David Cramer',
     author_email='[email protected]',
     url='http://github.com/dcramer/raven',