tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] six.iteritems

Browse Source
This commit is contained in:
Al
2016-05-16 02:08:43 -04:00
parent 601ec7f1db
commit a90bd2d0f5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/geodata/osm/components.py
View File

@@ -1,4 +1,5 @@
import os import os
import six
import yaml import yaml
from geodata.address_formatting.formatter import AddressFormatter from geodata.address_formatting.formatter import AddressFormatter
@@ -52,7 +53,7 @@ class OSMAddressComponents(object):
country_code = filename.rsplit('.yaml', 1)[0] country_code = filename.rsplit('.yaml', 1)[0]
data = yaml.load(open(os.path.join(boundaries_dir, filename))) data = yaml.load(open(os.path.join(boundaries_dir, filename)))
for prop, values in data.iteritems(): for prop, values in six.iteritems(data):
for k, v in values.iteritems(): for k, v in values.iteritems():
if v not in AddressFormatter.address_formatter_fields: if v not in AddressFormatter.address_formatter_fields:
raise ValueError(u'Invalid value in {} for prop={}, key={}: {}'.format(filename, prop, k, v)) raise ValueError(u'Invalid value in {} for prop={}, key={}: {}'.format(filename, prop, k, v))