From 32b6217aa8f158fb3b8cc6b5168600ff6094a1d1 Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 19 Apr 2016 11:22:13 -0400 Subject: [PATCH] [addresses] Conjunction can be subclassed --- scripts/geodata/addresses/conjunctions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/geodata/addresses/conjunctions.py b/scripts/geodata/addresses/conjunctions.py index e646aa47..38b768e3 100644 --- a/scripts/geodata/addresses/conjunctions.py +++ b/scripts/geodata/addresses/conjunctions.py @@ -7,6 +7,7 @@ from geodata.encoding import safe_decode class Conjunction(object): DEFAULT_WHITESPACE_JOIN = ', ' DEFAULT_NON_WHITESPACE_JOIN = '' + key = 'and' @classmethod def join(cls, phrases, language, country=None): @@ -14,7 +15,7 @@ class Conjunction(object): if not hasattr(phrases, '__iter__'): raise ValueError('Param phrases must be iterable') - values, probs = address_config.alternative_probabilities('and', language, country=country) + values, probs = address_config.alternative_probabilities(cls.key, language, country=country) phrase, props = weighted_choice(values, probs) whitespace = props.get('whitespace', True)