entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

use items() instead of iteritems() (#38923)

This commit is contained in:
Emmanuel Cazenave 2020-01-08 14:51:45 +01:00
parent c7896188c2
commit 199210f9e2
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passerelle/apps/api_particulier/models.py
View File

@ -49,7 +49,7 @@ class APIParticulier(BaseResource):
platform = models.CharField(
verbose_name=_('Platform'),
max_length=8,
choices=[(key, platform['label']) for key, platform in PLATFORMS.iteritems()])
choices=[(key, platform['label']) for key, platform in PLATFORMS.items()])
api_key = models.CharField(
max_length=256,

4
passerelle/apps/cityweb/cityweb.py
View File

@ -149,8 +149,8 @@ class ComplexType(CityWebType):
self.data = data
def extract_by_pattern(self, data):
data = {key: value for key, value in data.iteritems() if self.pattern in key}
data = {key.replace(self.pattern, ''): value for key, value in data.iteritems()}
data = {key: value for key, value in data.items() if self.pattern in key}
data = {key.replace(self.pattern, ''): value for key, value in data.items()}
return data

2
passerelle/contrib/dpark/models.py
View File

@ -122,7 +122,7 @@ def normalize_reply(reply):
excluded = ('CodeRetour', 'MessageRetour')
serialized_reply = serialize_object(reply)
data = {
key.lower(): value for key, value in serialized_reply.iteritems() if key not in excluded}
key.lower(): value for key, value in serialized_reply.items() if key not in excluded}
if data.get('demande_numerodossier'):
data['id'] = str(data['demande_numerodossier'])
text = '%(demande_numerodossier)s - %(demandeur_nomusuel)s %(demandeur_prenom)s - %(demande_immatvehicule1)s' % data

4
passerelle/contrib/gdema/models.py
View File

@ -74,7 +74,7 @@ def normalize(value):
if isinstance(value, list):
return [normalize(item) for item in value]
if isinstance(value, dict):
return {k: normalize(v) for k, v in value.iteritems()}
return {k: normalize(v) for k, v in value.items()}
return value
@ -102,7 +102,7 @@ def to_gdema(input_dict):
Name_<int>: value -> Name: [value, ...]
'''
gdema_dict = {}
for key, value in input_dict.iteritems():
for key, value in input_dict.items():
# nameDate: ... -> nameDate: /Date(...)/
if key.endswith('Date'):
value = gdema_datetime(value)

12
passerelle/contrib/meyzieu_newsletters/models.py
View File

@ -64,7 +64,7 @@ class MeyzieuNewsletters(BaseResource):
logger.error('<%r> getListRubrique failed: %r', self.slug, e)
return []
newsletters = {}
for kind, value in response.json().iteritems():
for kind, value in response.json().items():
for item in value:
newsletter = newsletters.setdefault(item['id_rubrique'], {})
newsletter['id'] = item['id_rubrique']
@ -93,14 +93,14 @@ class MeyzieuNewsletters(BaseResource):
'auteur[email]': email,
}
for subscription_id, data in currents.iteritems():
for subscription_id, data in currents.items():
if subscription_id not in subs:
continue
transports = [i['id'] for i in data['transports']]
new = subs.get(subscription_id, [])
remove[subscription_id] = set(transports) - set(new['transports'])
for subscription_id, kinds in subs.iteritems():
for subscription_id, kinds in subs.items():
current_transports = currents.get(subscription_id, {}).get('transports', [])
transports = [i['id'] for i in current_transports]
new_transports = kinds['transports']
@ -108,7 +108,7 @@ class MeyzieuNewsletters(BaseResource):
new = set(new_transports) - set(transports)
add[subscription_id] = new
for i, (subscription_id, kinds) in enumerate(remove.iteritems()):
for i, (subscription_id, kinds) in enumerate(remove.items()):
params = base.copy()
params.update({
'desabonnement': 1,
@ -124,7 +124,7 @@ class MeyzieuNewsletters(BaseResource):
logger.error("<%r> '%r' addAbonnement failed: %r", self.slug, email, e)
raise SubscriptionsGetError('error on getting subscriptions')
for i, (subscription_id, kinds) in enumerate(add.iteritems()):
for i, (subscription_id, kinds) in enumerate(add.items()):
params = base.copy()
params.update({
'id_abonnement[%d]' % i: subscription_id,
@ -158,7 +158,7 @@ class MeyzieuNewsletters(BaseResource):
if 'abonnement' in response.json():
newsletters = {}
available_kinds = []
for kind, value in response.json()['abonnement'].iteritems():
for kind, value in response.json()['abonnement'].items():
available_kinds.append(kind)
for item in value:
if item['id_abonnement'] not in n:

4
passerelle/contrib/teamnet_axel/models.py
View File

@ -252,7 +252,7 @@ class TeamnetAxel(BaseResource):
if not family_id:
return {'data': []}
invoices = self.get_teamnet_payable_invoices(regie_id, family_id)
invoices = sorted([p for i, p in invoices.iteritems()], key=lambda i: i['created'], reverse=True)
invoices = sorted([p for i, p in invoices.items()], key=lambda i: i['created'], reverse=True)
return {'data': invoices}
def get_teamnet_historical_invoices(self, regie_id, family_id):
@ -280,7 +280,7 @@ class TeamnetAxel(BaseResource):
return {'data': []}
payable = self.get_teamnet_payable_invoices(regie_id, family_id)
historical = self.get_teamnet_historical_invoices(regie_id, family_id)
historical = [v for i, v in historical.iteritems() if i not in payable]
historical = [v for i, v in historical.items() if i not in payable]
invoices = sorted(historical, key=lambda i: i['created'], reverse=True)
return {'data': invoices}

2
passerelle/contrib/tlmcom/views.py
View File

@ -41,7 +41,7 @@ class CallStart(SingleObjectMixin, View):
if username:
# "id" is a tlmcom dirty hack: the real username is just the part after the dot
username = username.split('.', 1).pop()
data = dict(request.GET.iteritems())
data = dict(request.GET.items())
for key in ['caller', 'callee', 'id']:
data.pop(key, None)
self.get_object().notify_welco(self.event, caller, username or callee, data)

2
passerelle/soap.py
View File

@ -143,7 +143,7 @@ def client_to_jsondict(client):
def sudsobject_to_dict(sudsobject):
out = {}
for key, value in suds.sudsobject.asdict(sudsobject).iteritems():
for key, value in suds.sudsobject.asdict(sudsobject).items():
if hasattr(value, '__keylist__'):
out[key] = sudsobject_to_dict(value)
elif isinstance(value, list):

2
passerelle/utils/__init__.py
View File

@ -98,7 +98,7 @@ def get_trusted_services():
'''
trusted_services = []
for service_type in getattr(settings, 'KNOWN_SERVICES', {}):
for slug, service in settings.KNOWN_SERVICES[service_type].iteritems():
for slug, service in settings.KNOWN_SERVICES[service_type].items():
if service.get('secret') and service.get('verif_orig'):
trusted_service = service.copy()
trusted_service['service_type'] = service_type

2
tests/test_family.py
View File

@ -345,7 +345,7 @@ def test_family_pending_invoices_by_nameid():
name_id='testnameid2')
links = resource.get_pending_invoices_by_nameid(None)
assert len(links['data']) == 2
for uuid, invoices in links['data'].iteritems():
for uuid, invoices in links['data'].items():
assert uuid in ('testnameid1', 'testnameid2')
assert len(invoices) >= 1

2
tests/test_sms.py
View File

@ -57,7 +57,7 @@ def test_connectors(app, connector):
for test_vector in getattr(connector, 'TEST_DEFAULTS', {}).get('test_vectors', []):
with utils.mock_url(connector.URL, test_vector['response']):
result = app.post_json(path, params=payload)
for key, value in test_vector['result'].iteritems():
for key, value in test_vector['result'].items():
assert key in result.json
assert result.json[key] == value