diff --git a/agkyra/syncer/setup.py b/agkyra/syncer/setup.py index 9b13842b9592fe437d1f7d52e3cec2487014625e..d1dbf16949e6af355aebf5b75f96b2d0d6a73066 100644 --- a/agkyra/syncer/setup.py +++ b/agkyra/syncer/setup.py @@ -32,9 +32,6 @@ from kamaki.clients.astakos import AstakosClient from kamaki.clients.pithos import PithosClient from kamaki.clients.utils import https -# this will be deleted when kamaki 0.13.5 is out -from kamaki.clients.astakos import AstakosClientError - logger = logging.getLogger(__name__) @@ -80,17 +77,6 @@ def ssl_fall_back(method): 'Kamaki SSL failed, fall back to certifi (mozilla certs)') https.patch_with_certs(os.path.join(RESOURCES, 'cacert.pem')) return method(self, *args, **kwargs) - # this will be deleted when kamaki 0.13.5 is out - except AstakosClientError as ace: - logger.debug('Kamaki failed with error %s' % ace) - if '[Errno 2]' in ace.message: - logger.info( - 'Kamaki SSL failed with AstakosClientError [Errno 2], ' - 'fall back to certifi (mozilla certs)') - https.patch_with_certs(os.path.join(RESOURCES, 'cacert.pem')) - return method(self, *args, **kwargs) - else: - raise return wrap diff --git a/setup.py b/setup.py index 597294570d926cece1de2ed5755d27a4df99401f..7648ceade4625b97c9139533c6167de5c54f4c2b 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ CLASSIFIERS = [] # Package requirements INSTALL_REQUIRES = [ - 'kamaki>=0.13.4', + 'kamaki>=0.13.5', 'watchdog', 'psutil', 'ws4py',