From 9c718772b16be75cca61c149d4d447aa1a287c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 12 Nov 2008 22:24:15 +0100 Subject: [PATCH] Fix get_full_address for issue533 --- address.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/address.py b/address.py index 4c87c71225..8e42a9345c 100644 --- a/address.py +++ b/address.py @@ -58,13 +58,20 @@ class Address(OSV): if address.zip or address.city: if res[address.id]: res[address.id] += '\n' - res[address.id] += address.zip or '' + ' ' + address.city or '' + if address.zip: + res[address.id] += address.zip + if address.city: + if res[address.id][-1:] != '\n': + res[address.id] += ' ' + res[address.id] += address.city if address.country or address.subdivision: if res[address.id]: res[address.id] += '\n' if address.subdivision: - res[address.id] += ' ' + address.subdivision.name + res[address.id] += address.subdivision.name if address.country: + if res[address.id][-1:] != '\n': + res[address.id] += ' ' res[address.id] += address.country.name return res