From d987546230b786b984398d8b9ca5af8c2cae9413 Mon Sep 17 00:00:00 2001 From: speedplane Date: Sat, 31 May 2014 10:22:33 -0400 Subject: [PATCH] Add relative imports so 1.0 and 0.9x can co-exist. --- elasticsearch/__init__.py | 12 ++++++------ elasticsearch/helpers/__init__.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py index 2ec3ce53..51a09150 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -4,12 +4,12 @@ VERSION = (1, 0, 1) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) -from elasticsearch.client import Elasticsearch -from elasticsearch.transport import Transport -from elasticsearch.connection_pool import ConnectionPool, ConnectionSelector, \ +from .client import Elasticsearch +from .transport import Transport +from .connection_pool import ConnectionPool, ConnectionSelector, \ RoundRobinSelector -from elasticsearch.serializer import JSONSerializer -from elasticsearch.connection import Connection, RequestsHttpConnection, \ +from .serializer import JSONSerializer +from .connection import Connection, RequestsHttpConnection, \ Urllib3HttpConnection, MemcachedConnection, ThriftConnection -from elasticsearch.exceptions import * +from .exceptions import * diff --git a/elasticsearch/helpers/__init__.py b/elasticsearch/helpers/__init__.py index 013dc9e5..f4294ed5 100644 --- a/elasticsearch/helpers/__init__.py +++ b/elasticsearch/helpers/__init__.py @@ -1,8 +1,8 @@ from itertools import islice from operator import methodcaller -from elasticsearch.exceptions import ElasticsearchException -from elasticsearch.compat import map +from ..exceptions import ElasticsearchException +from ..compat import map class BulkIndexError(ElasticsearchException): @property