Created
April 27, 2017 18:21
-
-
Save talwai/d32a43b1d293acdc50e6e70754608d7d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From d6217f15009760aec1a0d68ddcbb2278ceee4ac8 Mon Sep 17 00:00:00 2001 | |
From: talwai <[email protected]> | |
Date: Thu, 27 Apr 2017 12:10:23 -0400 | |
Subject: [PATCH] django: handle tuple INSTALLED_APPS | |
--- | |
ddtrace/contrib/django/patch.py | 12 ++++++++++-- | |
1 file changed, 10 insertions(+), 2 deletions(-) | |
diff --git a/ddtrace/contrib/django/patch.py b/ddtrace/contrib/django/patch.py | |
index 93319eb..cecada4 100644 | |
--- a/ddtrace/contrib/django/patch.py | |
+++ b/ddtrace/contrib/django/patch.py | |
@@ -16,11 +16,19 @@ def traced_setup(wrapped, instance, args, kwargs): | |
from django.conf import settings | |
if 'ddtrace.contrib.django' not in settings.INSTALLED_APPS: | |
- settings.INSTALLED_APPS.append('ddtrace.contrib.django') | |
+ if isinstance(settings.INSTALLED_APPS, tuple): | |
+ # INSTALLED_APPS is a tuple < 1.9 | |
+ settings.INSTALLED_APPS = settings.INSTALLED_APPS + ('ddtrace.contrib.django', ) | |
+ else: | |
+ settings.INSTALLED_APPS.append('ddtrace.contrib.django') | |
if hasattr(settings, 'MIDDLEWARE_CLASSES'): | |
if 'ddtrace.contrib.django.TraceMiddleware' not in settings.MIDDLEWARE_CLASSES: | |
- settings.MIDDLEWARE_CLASSES.insert(0, 'ddtrace.contrib.django.TraceMiddleware') | |
+ if isinstance(settings.MIDDLEWARE_CLASSES, tuple): | |
+ # MIDDLEWARE_CLASSES is a tuple < 1.9 | |
+ settings.MIDDLEWARE_CLASSES = ('ddtrace.contrib.django.TraceMiddleware', ) + settings.MIDDLEWARE_CLASSES | |
+ else: | |
+ settings.MIDDLEWARE_CLASSES.insert(0, 'ddtrace.contrib.django.TraceMiddleware') | |
if hasattr(settings, 'MIDDLEWARE'): | |
if 'ddtrace.contrib.django.TraceMiddleware' not in settings.MIDDLEWARE: | |
-- | |
2.3.5 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment