diff --git a/encore/storage/abstract_store.py b/encore/storage/abstract_store.py index 4052238..cd3ee4f 100644 --- a/encore/storage/abstract_store.py +++ b/encore/storage/abstract_store.py @@ -27,7 +27,7 @@ from cStringIO import StringIO import warnings -from encore.events.api import get_event_manager +from ..events.api import get_event_manager from .utils import StoreProgressManager, buffer_iterator diff --git a/encore/storage/dynamic_url_store.py b/encore/storage/dynamic_url_store.py index 722de41..3ce0e40 100644 --- a/encore/storage/dynamic_url_store.py +++ b/encore/storage/dynamic_url_store.py @@ -10,13 +10,9 @@ import urllib import rfc822 -import requests - from .abstract_store import AbstractAuthorizingStore, Value, AuthorizationError from .utils import DummyTransactionContext -_requests_version = requests.__version__.split('.')[0] - DEFAULT_PARTS = {'data': 'data', 'metadata': 'metadata', 'permissions': 'auth'} @@ -104,12 +100,8 @@ def mimetype(self): return self._mimetype def open(self): - if _requests_version == '0': - self._data_response = self._session.get(self._url('data'), - prefetch=False) - else: - self._data_response = self._session.get(self._url('data'), - stream=True) + self._data_response = self._session.get(self._url('data'), + stream=True) self._validate_response(self._data_response) size = self._data_response.headers['Content-Length'] @@ -211,14 +203,11 @@ def set_metadata(self, key, metadata): json.dumps(metadata)) self._validate_response(response, key) set_metadata.__doc__ = AbstractAuthorizingStore.set_metadata.__doc__ - + def get_metadata(self, key, select=None): response = self._session.get(self._url(key, 'metadata')) self._validate_response(response, key) - if _requests_version=='0': - metadata = response.json - else: - metadata = response.json() + metadata = response.json() if select is not None: return dict((k, metadata[k]) for k in select if k in metadata) else: @@ -234,10 +223,7 @@ def update_metadata(self, key, metadata): def get_permissions(self, key): response = self._session.get(self._url(key, 'permissions')) self._validate_response(response, key) - if _requests_version=='0': - return response.json - else: - return response.json() + return response.json() get_permissions.__doc__ = AbstractAuthorizingStore.get_permissions.__doc__ def set_permissions(self, key, permissions): diff --git a/encore/storage/events.py b/encore/storage/events.py index 708e9e6..710e020 100644 --- a/encore/storage/events.py +++ b/encore/storage/events.py @@ -13,7 +13,7 @@ Storage API. """ -from encore.events.api import (BaseEvent, ProgressEvent, ProgressStartEvent, +from ..events.api import (BaseEvent, ProgressEvent, ProgressStartEvent, ProgressStepEvent, ProgressEndEvent) diff --git a/encore/storage/utils.py b/encore/storage/utils.py index d1b88a1..27a36f2 100644 --- a/encore/storage/utils.py +++ b/encore/storage/utils.py @@ -16,7 +16,7 @@ import sys import itertools -from encore.events.api import ProgressManager +from ..events.api import ProgressManager from .events import (StoreTransactionStartEvent, StoreTransactionEndEvent, StoreProgressStartEvent, StoreProgressStepEvent, StoreProgressEndEvent, StoreModificationEvent)