Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit 304faee

Browse files
committed
Remove aiohttp
1 parent 6850500 commit 304faee

File tree

7 files changed

+8
-104
lines changed

7 files changed

+8
-104
lines changed

Diff for: CHANGES

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Version 5.4.0
55
* ``raven.conf.load`` has been removed.
66
* Upstream-related configuration (such as url, project_id, and keys) is now contained in ``RemoteConfig``
77
attached to ``Client.remote``
8+
* The ``aiohttp`` transport has been moved to ``raven-aiohttp`` package.
89

910
Version 5.3.1
1011
-------------

Diff for: docs/integrations/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Integrations
77
.. toctree::
88
:maxdepth: 2
99

10-
aiohttp
1110
asyncio
1211
bottle
1312
celery

Diff for: docs/transports/index.rst

+6-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ Builtin Transports
4141

4242
A synchronous blocking transport.
4343

44-
.. data:: sentry.transport.aiohttp.AioHttpTransport
45-
46-
Should only be used within a :pep:`3156` compatible event loops
47-
(*asyncio* itself and others).
48-
4944
.. data:: sentry.transport.eventlet.EventletHTTPTransport
5045

5146
Should only be used within an Eventlet IO loop.
@@ -65,3 +60,9 @@ Builtin Transports
6560
.. data:: sentry.transport.twisted.TwistedHTTPTransport
6661

6762
Should only be used within a Twisted event loop.
63+
64+
65+
Other Transports
66+
----------------
67+
68+
- `aiohttp <https://github.com/getsentry/raven-aiohttp>`_

Diff for: raven/transport/__init__.py

-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# TODO: deprecate this namespace and force non-default (sync + threaded) to
99
# manually import/register transports somehow
1010
from __future__ import absolute_import
11-
import sys
1211

1312
from raven.transport.base import * # NOQA
1413
from raven.transport.eventlet import * # NOQA
@@ -20,6 +19,3 @@
2019
from raven.transport.twisted import * # NOQA
2120
from raven.transport.threaded import * # NOQA
2221
from raven.transport.tornado import * # NOQA
23-
24-
if sys.version_info >= (3, 3):
25-
from raven.transport.aiohttp import * # NOQA

Diff for: raven/transport/aiohttp.py

-80
This file was deleted.

Diff for: raven/transport/registry.py

-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
:license: BSD, see LICENSE for more details.
77
"""
88
from __future__ import absolute_import
9-
import sys
109

1110
# TODO(dcramer): we really should need to import all of these by default
1211
from raven.transport.eventlet import EventletHTTPTransport
@@ -20,9 +19,6 @@
2019
from raven.transport.tornado import TornadoHTTPTransport
2120
from raven.utils import urlparse
2221

23-
if sys.version_info >= (3, 3):
24-
from raven.transport.aiohttp import AioHttpTransport
25-
2622

2723
class TransportRegistry(object):
2824
def __init__(self, transports=None):
@@ -85,6 +81,3 @@ def compute_scope(self, url, scope):
8581
TornadoHTTPTransport,
8682
EventletHTTPTransport,
8783
]
88-
89-
if sys.version_info >= (3, 3):
90-
default_transports += [AioHttpTransport]

Diff for: setup.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
unittest2_requires = []
5353
webpy_tests_requires = []
5454

55-
if sys.version_info >= (3, 3):
56-
aiohttp_requires = ['aiohttp']
57-
else:
58-
aiohttp_requires = []
59-
60-
6155
tests_require = [
6256
'bottle',
6357
'celery>=2.5',
@@ -77,7 +71,7 @@
7771
'webob',
7872
'webtest',
7973
'anyjson',
80-
] + (aiohttp_requires + flask_requires + flask_tests_requires +
74+
] + (flask_requires + flask_tests_requires +
8175
unittest2_requires + webpy_tests_requires)
8276

8377

0 commit comments

Comments
 (0)