From 3a643f54b51c226d31cc0d095f19f6387de358fd Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 24 Jul 2016 12:29:29 +0200 Subject: [PATCH] port to python-zeep >= 0.12.0 which uses _soapheaders Prior to this commit, we useda custom modified versin of python-zeep that accepts a list of headesr as part of the _soapheader argument. Recent changes to python-zeep include that support natively using the _soapeheaders [plural] argument. Port the code to that. --- inema/inema.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inema/inema.py b/inema/inema.py index b024922..8dc818d 100644 --- a/inema/inema.py +++ b/inema/inema.py @@ -66,7 +66,7 @@ class Internetmarke(object): def authenticate(self, username, password): s = self.client.service - r = s.authenticateUser(_soapheader= self.soapheader, username=username, password=password) + r = s.authenticateUser(_soapheaders= self.soapheader, username=username, password=password) self.user_token = r.userToken self.wallet_balance = r.walletBalance @@ -83,7 +83,7 @@ class Internetmarke(object): def retrievePreviewPNG(self, prod_code, layout = "AddressZone"): s = self.client.service - r = s.retrievePreviewVoucherPNG(_soapheader = self.soapheader, + r = s.retrievePreviewVoucherPNG(_soapheaders = self.soapheader, productCode = prod_code, voucherLayout = layout) _logger.info("retrievePreviewPNG result: %s", r) @@ -107,7 +107,7 @@ class Internetmarke(object): s = self.client.service # FIXME: convert ShoppingCartPosition to ShoppingCartPDFPosition _logger.info("Submitting basket with %u positions", len(self.positions)) - r = s.checkoutShoppingCartPDF(_soapheader = self.soapheader, + r = s.checkoutShoppingCartPDF(_soapheaders = self.soapheader, userToken = self.user_token, pageFormatId = page_format, positions = self.positions, @@ -120,7 +120,7 @@ class Internetmarke(object): def checkoutPNG(self): s = self.client.service _logger.info("Submitting basket with %u positions", len(self.positions)) - r = s.checkoutShoppingCartPNG(_soapheader= self.soapheader, + r = s.checkoutShoppingCartPNG(_soapheaders = self.soapheader, userToken = self.user_token, positions = self.positions, total = self.compute_total(), diff --git a/setup.py b/setup.py index 5f104ab..d269274 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages, setup install_requires = [ - 'zeep', + 'zeep >= 0.12.0', 'lxml', ]