async is a keyword in Python 3.7, rename. Bump revision.

3 files changed, 48 insertions, 2 deletions

diff --git a/net/py-apache-libcloud/Makefile b/net/py-apache-libcloud/Makefile
index ed8a906eacb..4a9841440cd 100644
--- a/net/py-apache-libcloud/Makefile
+++ b/net/py-apache-libcloud/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2017/09/26 17:21:10 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/12/27 15:05:27 joerg Exp $
 
 DISTNAME=	apache-libcloud-2.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/apache-libcloud/}
 
@@ -17,5 +18,9 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-requests-mock-[0-9]*:../../devel/py-requests-mock
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
+pre-install:
+	${RM} ${WRKSRC}/libcloud/compute/drivers/azure.py.orig
+	${RM} ${WRKSRC}/build/lib/libcloud/compute/drivers/azure.py.orig
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-apache-libcloud/distinfo b/net/py-apache-libcloud/distinfo
index 6778b984ae6..6cb85c3f305 100644
--- a/net/py-apache-libcloud/distinfo
+++ b/net/py-apache-libcloud/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/09/26 17:21:10 adam Exp $
+$NetBSD: distinfo,v 1.8 2018/12/27 15:05:27 joerg Exp $
 
 SHA1 (apache-libcloud-2.2.1.tar.gz) = a59b545a90414f6b2fbc9805bf3ccb4090caef86
 RMD160 (apache-libcloud-2.2.1.tar.gz) = 4bbf6a9b58db6cf522a0c031ff62e3751dabf974
 SHA512 (apache-libcloud-2.2.1.tar.gz) = 97dc044d07888320655ea0cc16e21f61550f2c52a17464a45e6701841c03de315e94e520e50e112456869d2ae0c88e5c11175157660d1e81f2477f92ece0cb97
 Size (apache-libcloud-2.2.1.tar.gz) = 1768112 bytes
+SHA1 (patch-libcloud_compute_drivers_azure.py) = 0ec64d3d8ea729284fe7fc0b068fc432e3a07836
diff --git a/net/py-apache-libcloud/patches/patch-libcloud_compute_drivers_azure.py b/net/py-apache-libcloud/patches/patch-libcloud_compute_drivers_azure.py
new file mode 100644
index 00000000000..a0c27d2183b
--- /dev/null
+++ b/net/py-apache-libcloud/patches/patch-libcloud_compute_drivers_azure.py
@@ -0,0 +1,40 @@
+$NetBSD: patch-libcloud_compute_drivers_azure.py,v 1.1 2018/12/27 15:05:27 joerg Exp $
+
+--- libcloud/compute/drivers/azure.py.orig	2018-12-25 21:46:13.858442899 +0000
++++ libcloud/compute/drivers/azure.py
+@@ -1435,7 +1435,7 @@ class AzureNodeDriver(NodeDriver):
+ 
+         return response
+ 
+-    def _perform_post(self, path, body, response_type=None, async=False):
++    def _perform_post(self, path, body, response_type=None, is_async=False):
+         request = AzureHTTPRequest()
+         request.method = 'POST'
+         request.host = AZURE_SERVICE_MANAGEMENT_HOST
+@@ -1447,7 +1447,7 @@ class AzureNodeDriver(NodeDriver):
+ 
+         return response
+ 
+-    def _perform_put(self, path, body, response_type=None, async=False):
++    def _perform_put(self, path, body, response_type=None, is_async=False):
+         request = AzureHTTPRequest()
+         request.method = 'PUT'
+         request.host = AZURE_SERVICE_MANAGEMENT_HOST
+@@ -1459,7 +1459,7 @@ class AzureNodeDriver(NodeDriver):
+ 
+         return response
+ 
+-    def _perform_delete(self, path, async=False):
++    def _perform_delete(self, path, is_async=False):
+         request = AzureHTTPRequest()
+         request.method = 'DELETE'
+         request.host = AZURE_SERVICE_MANAGEMENT_HOST
+@@ -1470,7 +1470,7 @@ class AzureNodeDriver(NodeDriver):
+ 
+         self.raise_for_response(response, 202)
+ 
+-        if async:
++        if is_async:
+             return self._parse_response_for_async_op(response)
+ 
+     def _perform_request(self, request):