[Erp5-report] r12725 - /erp5/trunk/products/ERP5/Document/GeographicAddress.py

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Feb 15 14:13:27 2007
New Revision: 12725

URL: http://svn.erp5.org?rev=12725&view=rev
Log:
remove country= parameter for asText. It's not part of the interface, and
anyway is not passed by getDefaultAddressText and others.


Modified:
    erp5/trunk/products/ERP5/Document/GeographicAddress.py

Modified: erp5/trunk/products/ERP5/Document/GeographicAddress.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/GeographicAddress.py?rev=12725&r1=12724&r2=12725&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/GeographicAddress.py (original)
+++ erp5/trunk/products/ERP5/Document/GeographicAddress.py Thu Feb 15 14:13:27 2007
@@ -67,19 +67,15 @@
     __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