From a05a92157240411388455f33dd4788a8f3cdedfd Mon Sep 17 00:00:00 2001
From: Giorgos Korfiatis <gkorf@grnet.gr>
Date: Fri, 25 Sep 2015 18:45:00 +0300
Subject: [PATCH] Use kamaki 0.13.5 to fix ssl issue
---
agkyra/syncer/setup.py | 14 --------------
setup.py | 2 +-
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/agkyra/syncer/setup.py b/agkyra/syncer/setup.py
index 9b13842..d1dbf16 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 5972945..7648cea 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',
--
GitLab