Kill various legacy settings

3 files changed, 2 insertions, 21 deletions

diff --git a/raven/base.py b/raven/base.py
index d4ee695..d261332 100644
--- a/raven/base.py
+++ b/raven/base.py
@@ -142,7 +142,7 @@ class Client(object):
 
         self.include_paths = set(o.get('include_paths') or [])
         self.exclude_paths = set(o.get('exclude_paths') or [])
-        self.name = six.text_type(o.get('name') or defaults.NAME)
+        self.name = six.text_type(o.get('name') or o.get('machine') or defaults.NAME)
         self.auto_log_stacks = bool(
             o.get('auto_log_stacks') or defaults.AUTO_LOG_STACKS)
         self.capture_locals = bool(
@@ -151,7 +151,7 @@ class Client(object):
             o.get('string_max_length') or defaults.MAX_LENGTH_STRING)
         self.list_max_length = int(
             o.get('list_max_length') or defaults.MAX_LENGTH_LIST)
-        self.site = o.get('site', defaults.SITE)
+        self.site = o.get('site')
         self.include_versions = o.get('include_versions', True)
         self.processors = o.get('processors')
         if self.processors is None:
@@ -166,7 +166,6 @@ class Client(object):
 
         self.module_cache = ModuleProxyCache()
 
-        # servers may be set to a NoneType (for Django)
         if not self.is_enabled():
             self.logger.info(
                 'Raven is not configured (logging is disabled). Please see the'
diff --git a/raven/conf/defaults.py b/raven/conf/defaults.py
index 11e3d39..c1fafb9 100644
--- a/raven/conf/defaults.py
+++ b/raven/conf/defaults.py
@@ -28,20 +28,6 @@ CLIENT = 'raven.contrib.django.DjangoClient'
 # will set it to None and require it passed in to ``Client`` on initializtion.
 NAME = socket.gethostname() if hasattr(socket, 'gethostname') else None
 
-# Superuser key -- will be used if set, otherwise defers to
-# SECRET_KEY and PUBLIC_KEY
-KEY = None
-
-# Credentials to authenticate with the Sentry server
-SECRET_KEY = None
-PUBLIC_KEY = None
-
-# We allow setting the site name either by explicitly setting it with the
-# SENTRY_SITE setting, or using the django.contrib.sites framework for
-# fetching the current site. Since we can't reliably query the database
-# from this module, the specific logic is within the SiteFilter
-SITE = None
-
 # The maximum number of elements to store for a list-like structure.
 MAX_LENGTH_LIST = 50
 
diff --git a/raven/contrib/django/models.py b/raven/contrib/django/models.py
index 2927bb9..3db5ce6 100644
--- a/raven/contrib/django/models.py
+++ b/raven/contrib/django/models.py
@@ -123,7 +123,6 @@ def get_client(client=None, reset=False):
     if _client[0] != client or reset:
         ga = lambda x, d=None: getattr(settings, 'SENTRY_%s' % x, d)
         options = copy.deepcopy(getattr(settings, 'RAVEN_CONFIG', {}))
-        options.setdefault('servers', ga('SERVERS'))
         options.setdefault('include_paths', ga('INCLUDE_PATHS', []))
         options['include_paths'] = set(options['include_paths']) | get_installed_apps()
         options.setdefault('exclude_paths', ga('EXCLUDE_PATHS'))
@@ -133,9 +132,6 @@ def get_client(client=None, reset=False):
         options.setdefault('string_max_length', ga('MAX_LENGTH_STRING'))
         options.setdefault('list_max_length', ga('MAX_LENGTH_LIST'))
         options.setdefault('site', ga('SITE'))
-        options.setdefault('public_key', ga('PUBLIC_KEY'))
-        options.setdefault('secret_key', ga('SECRET_KEY'))
-        options.setdefault('project', ga('PROJECT'))
         options.setdefault('processors', ga('PROCESSORS'))
         options.setdefault('dsn', ga('DSN'))
         options.setdefault('context', ga('CONTEXT'))