diff --git a/v3io/__init__.py b/v3io/__init__.py index fc79d63..020ed73 100644 --- a/v3io/__init__.py +++ b/v3io/__init__.py @@ -1 +1 @@ -__version__ = '0.2.1' +__version__ = '0.2.2' diff --git a/v3io/dataplane/context.py b/v3io/dataplane/context.py index 3667cbc..f926e9c 100644 --- a/v3io/dataplane/context.py +++ b/v3io/dataplane/context.py @@ -9,12 +9,13 @@ import v3io.dataplane.output import v3io.dataplane.items_cursor import v3io.common.helpers +import v3io.logger class Context(object): - def __init__(self, logger, endpoints=None, max_connections=4, timeout=None): - self._logger = logger + def __init__(self, logger=None, endpoints=None, max_connections=4, timeout=None): + self._logger = logger or v3io.logger.Logger(level='INFO') self._transport = v3io.dataplane.transport.Transport(logger, endpoints, max_connections, timeout) self._access_key = os.environ['V3IO_ACCESS_KEY'] diff --git a/v3io/dataplane/request.py b/v3io/dataplane/request.py index fb57eb1..d5f1cdb 100644 --- a/v3io/dataplane/request.py +++ b/v3io/dataplane/request.py @@ -1,11 +1,12 @@ import base64 import future.utils -import ujson + try: - from urllib.parse import urlparse -except ImportError: - from urlparse import urlparse + from urllib.parse import urlencode +except: + from urllib import urlencode +import ujson import v3io.common.helpers @@ -42,7 +43,7 @@ def encode_get_container_contents(container_name, access_key, kwargs): return _encode('GET', None, access_key, - '/{0}?{1}'.format(container_name, urllib.parse.urlencode(query)), + '/{0}?{1}'.format(container_name, urlencode(query)), {}, None)