python3: use items instead of iteritems

This commit is contained in:
Frédéric Péters 2018-03-26 09:50:12 +02:00
parent f21d662912
commit 79735f6418
6 changed files with 8 additions and 8 deletions

View File

@ -517,7 +517,7 @@ class Payment(PaymentCommon):
params['EMAIL'] = email
if description:
params['COM'] = description
for key, value in kwargs.iteritems():
for key, value in kwargs.items():
params[key.upper()] = value
params['SHASIGN'] = self.sha_sign_in(params)
# uniformize all values to UTF-8 string

View File

@ -112,7 +112,7 @@ class Payment(PaymentCommon):
if PATHFILE in self.options:
params[PATHFILE] = self.options[PATHFILE]
executable = os.path.join(self.binpath, executable)
args = [executable] + ["%s=%s" % p for p in params.iteritems()]
args = [executable] + ["%s=%s" % p for p in params.items()]
self.logger.debug('executing %s' % args)
result,_ = subprocess.Popen(' '.join(args),
stdout=subprocess.PIPE, shell=True).communicate()

View File

@ -140,7 +140,7 @@ class Payment(PaymentCommon):
def encode_data(self, data):
return u'|'.join(u'%s=%s' % (unicode(key), unicode(value))
for key, value in data.iteritems())
for key, value in data.items())
def seal_data(self, data):
s = self.encode_data(data)

View File

@ -178,7 +178,7 @@ class Payment(PaymentCommon):
form = urlparse.parse_qs(query_string)
if not set(form) >= set([REFERENCE, ETAT, REFSFP]):
raise ResponseError()
for key, value in form.iteritems():
for key, value in form.items():
form[key] = value[0]
logger.debug('received query_string %s' % query_string)
logger.debug('parsed as %s' % form)

View File

@ -173,7 +173,7 @@ EXTRA_RESULT_MAP = {
def add_vads(kwargs):
new_vargs = {}
for k, v in kwargs.iteritems():
for k, v in kwargs.items():
if k.startswith('vads_'):
new_vargs[k] = v
else:
@ -346,14 +346,14 @@ class Payment(PaymentCommon):
'name': force_text(field_name),
'value': force_text(field_value),
}
for field_name, field_value in fields.iteritems()])
for field_name, field_value in fields.items()])
return transaction_id, FORM, form
def response(self, query_string, **kwargs):
fields = urlparse.parse_qs(query_string, True)
if not set(fields) >= set([SIGNATURE, VADS_CTX_MODE, VADS_AUTH_RESULT]):
raise ResponseError()
for key, value in fields.iteritems():
for key, value in fields.items():
fields[key] = value[0]
copy = fields.copy()
bank_status = []

View File

@ -146,7 +146,7 @@ class Payment(PaymentCommon):
fields = parse_qs(query_string, True)
if not set(fields) >= set(['refdet', 'resultrans']):
raise ResponseError()
for key, value in fields.iteritems():
for key, value in fields.items():
fields[key] = value[0]
refdet = fields.get('refdet')
if refdet is None: