From 015efa924913ad48b689d47778927a9fa1af05e4 Mon Sep 17 00:00:00 2001 From: Al Date: Sun, 22 May 2016 03:19:41 -0400 Subject: [PATCH] [fix] pivot keys in address formatter --- scripts/geodata/address_formatting/formatter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/address_formatting/formatter.py b/scripts/geodata/address_formatting/formatter.py index 406d59e1..5d640cb6 100644 --- a/scripts/geodata/address_formatting/formatter.py +++ b/scripts/geodata/address_formatting/formatter.py @@ -470,7 +470,7 @@ class AddressFormatter(object): i = None pivot = None - pivot_keys = (AddressFormatter.CITY, AddressFormatter.COUNTRY) + pivot_keys = (AddressFormatter.CITY, AddressFormatter.STATE, AddressFormatter.COUNTRY) for component in pivot_keys: token = self.tag_token(component) @@ -480,7 +480,7 @@ class AddressFormatter(object): break if i is None: - raise ValueError('Template must contain one of {{{}}}'.format(','.join(pivot_keys))) + raise ValueError('Template {} does not contain one of {{{}}}'.format(country, ','.join(pivot_keys))) prev = pivot