python3: replace iteritems (#39092)
This commit is contained in:
parent
27af09b510
commit
46113c03dd
|
@ -87,7 +87,7 @@ class MaarchCourrier(object):
|
||||||
excluded_keys = ['content', 'format', 'status', 'maarch_courrier', 'pk']
|
excluded_keys = ['content', 'format', 'status', 'maarch_courrier', 'pk']
|
||||||
data = {key: self.__dict__[key] for key in self.__dict__ if key not in excluded_keys}
|
data = {key: self.__dict__[key] for key in self.__dict__ if key not in excluded_keys}
|
||||||
if data:
|
if data:
|
||||||
for key, value in data.iteritems():
|
for key, value in data.items():
|
||||||
if isinstance(value, basestring):
|
if isinstance(value, basestring):
|
||||||
d.append({'column': key, 'value': value, 'type': 'string'})
|
d.append({'column': key, 'value': value, 'type': 'string'})
|
||||||
elif isinstance(value, int):
|
elif isinstance(value, int):
|
||||||
|
|
|
@ -78,7 +78,7 @@ def get_wcs_json(wcs_url, path, wcs_site, params={}):
|
||||||
|
|
||||||
def get_wcs_options(url, condition=None, params={}):
|
def get_wcs_options(url, condition=None, params={}):
|
||||||
categories = {}
|
categories = {}
|
||||||
for wcs_key, wcs_site in get_wcs_services().iteritems():
|
for wcs_key, wcs_site in get_wcs_services().items():
|
||||||
site_title = wcs_site.get('title')
|
site_title = wcs_site.get('title')
|
||||||
response_json = get_wcs_json(wcs_site.get('url'), url, wcs_site, params)
|
response_json = get_wcs_json(wcs_site.get('url'), url, wcs_site, params)
|
||||||
if type(response_json) is dict:
|
if type(response_json) is dict:
|
||||||
|
|
Loading…
Reference in New Issue