From 37eb1e8ef6a472ab8539b78761ff679f8570c304 Mon Sep 17 00:00:00 2001 From: David Cramer Date: Wed, 15 Jul 2015 23:14:36 -0700 Subject: [PATCH] Remove various deprecated behaviors --- docs/usage.rst | 2 +- raven/contrib/flask.py | 4 ---- raven/contrib/zope/component.xml | 4 ---- raven/handlers/logging.py | 3 --- tests/base/tests.py | 19 ++++++++----------- tests/contrib/bottle/tests.py | 4 ++-- tests/contrib/flask/tests.py | 4 ++-- tests/contrib/pylons/tests.py | 4 +--- tests/contrib/webpy/tests.py | 4 ++-- tests/contrib/zerorpc/tests.py | 4 ++-- tests/handlers/logbook/tests.py | 4 ++-- tests/handlers/logging/tests.py | 8 ++------ tests/middleware/tests.py | 4 ++-- 13 files changed, 24 insertions(+), 44 deletions(-) diff --git a/docs/usage.rst b/docs/usage.rst index e5384c63..2ae8345e 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -60,7 +60,7 @@ You should get something like the following, assuming you're configured everythi http://dd2c825ff9b1417d88a99573903ebf80:91631495b10b45f8a1cdbc492088da6a@localhost:9000/1 Client configuration: - servers : ['http://localhost:9000/api/store/'] + base_url : http://localhost:9000 project : 1 public_key : dd2c825ff9b1417d88a99573903ebf80 secret_key : 91631495b10b45f8a1cdbc492088da6a diff --git a/raven/contrib/flask.py b/raven/contrib/flask.py index ed09af23..67ef1caf 100644 --- a/raven/contrib/flask.py +++ b/raven/contrib/flask.py @@ -45,11 +45,7 @@ def make_client(client_cls, app, dsn=None): transport=transport, include_paths=set(app.config.get('SENTRY_INCLUDE_PATHS', [])) | set([app.import_name]), exclude_paths=app.config.get('SENTRY_EXCLUDE_PATHS'), - servers=app.config.get('SENTRY_SERVERS'), name=app.config.get('SENTRY_NAME'), - public_key=app.config.get('SENTRY_PUBLIC_KEY'), - secret_key=app.config.get('SENTRY_SECRET_KEY'), - project=app.config.get('SENTRY_PROJECT'), site=app.config.get('SENTRY_SITE_NAME'), processors=app.config.get('SENTRY_PROCESSORS'), string_max_length=app.config.get('SENTRY_MAX_LENGTH_STRING'), diff --git a/raven/contrib/zope/component.xml b/raven/contrib/zope/component.xml index c3d92f2e..b4d36477 100644 --- a/raven/contrib/zope/component.xml +++ b/raven/contrib/zope/component.xml @@ -8,18 +8,14 @@ datatype="raven.contrib.zope.ZopeSentryHandlerFactory" implements="ZConfig.logger.handler" extends="ZConfig.logger.base-log-handler"> - - - - diff --git a/raven/handlers/logging.py b/raven/handlers/logging.py index e9083998..fa759965 100644 --- a/raven/handlers/logging.py +++ b/raven/handlers/logging.py @@ -42,9 +42,6 @@ class SentryHandler(logging.Handler, object): )) elif 'client' in kwargs: self.client = kwargs['client'] - elif len(args) == 2 and not kwargs: - servers, key = args - self.client = client(servers=servers, key=key) else: self.client = client(*args, **kwargs) diff --git a/tests/base/tests.py b/tests/base/tests.py index cce73fb9..ccbd547c 100644 --- a/tests/base/tests.py +++ b/tests/base/tests.py @@ -16,9 +16,9 @@ from raven.utils.testutils import TestCase class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True @@ -124,13 +124,13 @@ class ClientTest(TestCase): # test error send.side_effect = RateLimited('foo', 5) - client.send_remote('sync+http://example.com/api/store', client.encode({})) + client.send_remote('sync+http://example.com/api/1/store/', client.encode({})) self.assertEquals(client.state.status, client.state.ERROR) self.assertEqual(client.state.retry_after, 5) # test recovery send.side_effect = None - client.send_remote('sync+http://example.com/api/store', client.encode({})) + client.send_remote('sync+http://example.com/api/1/store/', client.encode({})) self.assertEquals(client.state.status, client.state.ONLINE) self.assertEqual(client.state.retry_after, 0) @@ -143,25 +143,22 @@ class ClientTest(TestCase): get_transport.return_value = async_transport client = Client( - servers=['http://example.com'], - public_key='public', - secret_key='secret', - project=1, + dsn='http://public:secret@example.com/1', ) # test immediate raise of error async_send.side_effect = Exception() - client.send_remote('http://example.com/api/store', client.encode({})) + client.send_remote('http://example.com/api/1/store/', client.encode({})) self.assertEquals(client.state.status, client.state.ERROR) # test recovery - client.send_remote('http://example.com/api/store', client.encode({})) + client.send_remote('http://example.com/api/1/store/', client.encode({})) success_cb = async_send.call_args[0][2] success_cb() self.assertEquals(client.state.status, client.state.ONLINE) # test delayed raise of error - client.send_remote('http://example.com/api/store', client.encode({})) + client.send_remote('http://example.com/api/1/store/', client.encode({})) failure_cb = async_send.call_args[0][3] failure_cb(Exception()) self.assertEquals(client.state.status, client.state.ERROR) diff --git a/tests/contrib/bottle/tests.py b/tests/contrib/bottle/tests.py index 18439ec0..08133984 100644 --- a/tests/contrib/bottle/tests.py +++ b/tests/contrib/bottle/tests.py @@ -10,9 +10,9 @@ from raven.utils.testutils import TestCase class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True diff --git a/tests/contrib/flask/tests.py b/tests/contrib/flask/tests.py index d1df979f..f66e34a2 100644 --- a/tests/contrib/flask/tests.py +++ b/tests/contrib/flask/tests.py @@ -12,9 +12,9 @@ from raven.utils.testutils import TestCase class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True diff --git a/tests/contrib/pylons/tests.py b/tests/contrib/pylons/tests.py index eb59869a..29b659c4 100644 --- a/tests/contrib/pylons/tests.py +++ b/tests/contrib/pylons/tests.py @@ -12,8 +12,6 @@ class MiddlewareTest(TestCase): def test_init(self): config = { - 'sentry.servers': 'http://localhost/api/store', - 'sentry.public_key': 'p' * 32, - 'sentry.secret_key': 's' * 32, + 'sentry.dsn': 'http://public:secret@example.com/1', } middleware = Sentry(self.app, config) diff --git a/tests/contrib/webpy/tests.py b/tests/contrib/webpy/tests.py index 29c8ae30..d96cb9c2 100644 --- a/tests/contrib/webpy/tests.py +++ b/tests/contrib/webpy/tests.py @@ -7,9 +7,9 @@ from raven.utils.testutils import TestCase class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True diff --git a/tests/contrib/zerorpc/tests.py b/tests/contrib/zerorpc/tests.py index 20b592d9..1228c9f6 100644 --- a/tests/contrib/zerorpc/tests.py +++ b/tests/contrib/zerorpc/tests.py @@ -13,9 +13,9 @@ gevent = pytest.importorskip("gevent") class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True diff --git a/tests/handlers/logbook/tests.py b/tests/handlers/logbook/tests.py index 12dbd7c2..aad74f56 100644 --- a/tests/handlers/logbook/tests.py +++ b/tests/handlers/logbook/tests.py @@ -9,9 +9,9 @@ from raven.handlers.logbook import SentryHandler class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True diff --git a/tests/handlers/logging/tests.py b/tests/handlers/logging/tests.py index 9bdbf621..a2dac308 100644 --- a/tests/handlers/logging/tests.py +++ b/tests/handlers/logging/tests.py @@ -12,9 +12,9 @@ from raven.utils.testutils import TestCase class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True @@ -227,10 +227,6 @@ class LoggingHandlerTest(TestCase): handler = SentryHandler(client=client) self.assertEqual(handler.client, client) - def test_args_as_servers_and_key(self): - handler = SentryHandler(['http://sentry.local/api/store/'], 'KEY') - self.assertTrue(isinstance(handler.client, Client)) - def test_first_arg_as_dsn(self): handler = SentryHandler('http://public:secret@example.com/1') self.assertTrue(isinstance(handler.client, Client)) diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index c9a67243..23e94caa 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -10,9 +10,9 @@ from raven.middleware import Sentry class TempStoreClient(Client): - def __init__(self, servers=None, **kwargs): + def __init__(self, **kwargs): self.events = [] - super(TempStoreClient, self).__init__(servers=servers, **kwargs) + super(TempStoreClient, self).__init__(**kwargs) def is_enabled(self): return True