entrouvert
/
debian-python-raven
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove various deprecated behaviors

This commit is contained in:
David Cramer 2015-07-15 23:14:36 -07:00
parent 9e4046f04d
commit 37eb1e8ef6
13 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/usage.rst
View File

@ -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

4
raven/contrib/flask.py
View File

@ -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'),

4
raven/contrib/zope/component.xml
View File

@ -8,18 +8,14 @@
datatype="raven.contrib.zope.ZopeSentryHandlerFactory"
implements="ZConfig.logger.handler"
extends="ZConfig.logger.base-log-handler">
<key name="servers" required="no"/>
<key name="include_paths" required="no" datatype="string-list"/>
<key name="exclude_paths" required="no" datatype="string-list"/>
<key name="timeout" required="no" datatype="integer"/>
<key name="name" required="no"/>
<key name="auto_log_stacks" required="no" datatype="boolean"/>
<key name="key" required="no"/>
<key name="string_max_length" required="no" datatype="integer"/>
<key name="list_max_length" required="no" datatype="integer"/>
<key name="site" required="no"/>
<key name="public_key" required="no"/>
<key name="secret_key" required="no"/>
<key name="processors" required="no" datatype="string-list"/>
<key name="project" required="no"/>
<key name="dsn" required="no"/>

3
raven/handlers/logging.py
View File

@ -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)

19
tests/base/tests.py
View File

@ -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)

4
tests/contrib/bottle/tests.py
View File

@ -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

4
tests/contrib/flask/tests.py
View File

@ -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

4
tests/contrib/pylons/tests.py
View File

@ -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)

4
tests/contrib/webpy/tests.py
View File

@ -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

4
tests/contrib/zerorpc/tests.py
View File

@ -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

4
tests/handlers/logbook/tests.py
View File

@ -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

8
tests/handlers/logging/tests.py
View File

@ -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))

4
tests/middleware/tests.py
View File

@ -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