Skip to content

Commit

Permalink
Merge pull request #14 from litwisha/exceptions
Browse files Browse the repository at this point in the history
exceptions.py
  • Loading branch information
hellysmile committed Jul 14, 2017
2 parents 8f7d01d + 36534c9 commit e74ef6c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion aioelasticsearch/__init__.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import asyncio

from elasticsearch import Elasticsearch as _Elasticsearch # isort:skip
from elasticsearch.exceptions import * # noqa # isort:skip

from elasticsearch.connection_pool import ( # noqa # isort:skip
ConnectionSelector, RoundRobinSelector,
)
from elasticsearch.serializer import JSONSerializer # noqa # isort:skip

from .compat import PY_350 # isort:skip
from .exceptions import * # noqa # isort:skip
from .pool import AIOHttpConnectionPool # noqa # isort:skip
from .transport import AIOHttpTransport # isort:skip

Expand Down
4 changes: 2 additions & 2 deletions aioelasticsearch/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
else:
from aiohttp.errors import ClientError

from .exceptions import ConnectionError, ConnectionTimeout, SSLError # noqa # isort:skip

from elasticsearch.connection import Connection # noqa # isort:skip
from elasticsearch.exceptions import (ConnectionError, ConnectionTimeout, # noqa # isort:skip
SSLError)
from yarl import URL # noqa # isort:skip


Expand Down
1 change: 1 addition & 0 deletions aioelasticsearch/exceptions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from elasticsearch.exceptions import * # noqa
2 changes: 1 addition & 1 deletion aioelasticsearch/pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import random

from elasticsearch.connection_pool import ConnectionSelector
from elasticsearch.exceptions import ImproperlyConfigured

from .compat import create_future
from .exceptions import ImproperlyConfigured

logger = logging.getLogger('elasticsearch')

Expand Down
4 changes: 2 additions & 2 deletions aioelasticsearch/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
import logging
from itertools import chain

from elasticsearch.exceptions import (ConnectionError, ConnectionTimeout,
SerializationError, TransportError)
from elasticsearch.serializer import (DEFAULT_SERIALIZERS, Deserializer,
JSONSerializer)
from elasticsearch.transport import Transport, get_host_info

from .compat import ensure_future
from .connection import AIOHttpConnection
from .exceptions import (ConnectionError, ConnectionTimeout,
SerializationError, TransportError)
from .pool import AIOHttpConnectionPool, DummyConnectionPool

logger = logging.getLogger('elasticsearch')
Expand Down

0 comments on commit e74ef6c

Please sign in to comment.