From 3f4c18ddb66810c2672671717bbf6cab0e4abafb Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 27 Jul 2016 01:16:05 -0400 Subject: [PATCH] [fix] None case for names --- scripts/geodata/addresses/components.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index db3082f4..8941e4e3 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -676,12 +676,12 @@ class AddressComponents(object): for k in (key, name_key, raw_key, raw_name_key): name = component_value.get(k) - if six.u(';') in name: - name = random.choice(name.split(six.u(';'))).strip() - elif six.u(',') in name: - name = name.split(six.u(','), 1)[0].strip() if name and not (name == existing_city_name and component != AddressFormatter.CITY and drop_duplicate_city_names): + if six.u(';') in name: + name = random.choice(name.split(six.u(';'))).strip() + elif six.u(',') in name: + name = name.split(six.u(','), 1)[0].strip() break # if we've checked all keys without finding a valid name, leave this component out else: