From 1aa9a702985f50577410ac080e4b8441f5163735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 15 Feb 2007 13:13:27 +0000
Subject: [PATCH] remove country= parameter for asText. It's not part of the
 interface, and anyway is not passed by getDefaultAddressText and others.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12725 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5/Document/GeographicAddress.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/product/ERP5/Document/GeographicAddress.py b/product/ERP5/Document/GeographicAddress.py
index 167fd4e763..8c4ca4374b 100644
--- a/product/ERP5/Document/GeographicAddress.py
+++ b/product/ERP5/Document/GeographicAddress.py
@@ -67,19 +67,15 @@ class GeographicAddress(Coordinate, Base):
     __implements__ = ( Interface.Coordinate )
 
     security.declareProtected(Permissions.AccessContentsInformation, 'asText')
-    def asText(self, country=''):
+    def asText(self):
         """
           Returns the address as a complete formatted string
           with street address, zip, city and region
         """
         result = Coordinate.asText(self)
         if result is None:
-          if country=='France' or country=='france' or country=='fr' :
-            result = ('%s\n%s %s') % (self.getStreetAddress() or '', 
-                            self.getZipCode() or '', self.getCity() or '')
-          else :
-            result = ('%s\n%s %s') % (self.getStreetAddress() or '', 
-                          self.getCity() or '', self.getZipCode() or '')
+          result = ('%s\n%s %s') % (self.getStreetAddress() or '',
+                      self.getCity() or '', self.getZipCode() or '')
         if not result.strip():
           return ''
         return result
-- 
2.30.9