[django] module renamed from settings to conf

Author: Emanuele Palazzetti

ddtrace/contrib/django/apps.py

@@ -4,8 +4,8 @@
 from django.apps import AppConfig
 
 # project
-from .settings import settings
 from .db import patch_db
+from .conf import settings
 from .templates import patch_template
 
 from ...ext import AppTypes

ddtrace/contrib/django/settings.py renamed to ddtrace/contrib/django/conf.py

@@ -1,7 +1,7 @@
 import logging
 
 # project
-from .settings import settings
+from .conf import settings
 
 from ...ext import http
 from ...contrib import func_name

ddtrace/contrib/django/middleware.py

@@ -4,7 +4,7 @@
 from django.core.urlresolvers import reverse
 
 # project
-from ddtrace.contrib.django.settings import settings
+from ddtrace.contrib.django.conf import settings
 from ddtrace.contrib.django import TraceMiddleware
 
 # testing

tests/contrib/django/test_middleware.py

@@ -5,7 +5,7 @@
 
 # project
 from ddtrace.tracer import Tracer
-from ddtrace.contrib.django.settings import settings
+from ddtrace.contrib.django.conf import settings
 
 # testing
 from ...test_tracer import DummyWriter