[OpenTAL-checkins] opental/PlacelessTranslationService PlacelessTr...

[Fernando Lalo Martins]

CVSROOT:        /cvsroot/opental
Module name:    opental
Changes by:     Fernando Lalo Martins <address@hidden>  03/02/27 14:04:50

Modified files:
        PlacelessTranslationService: PlacelessTranslationService.py 

Log message:
        somehow, callable() was returning true when it shouldn't - let's do as 
Guido says and ask for forgiveness instead of permission

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/opental/opental/PlacelessTranslationService/PlacelessTranslationService.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: opental/PlacelessTranslationService/PlacelessTranslationService.py
diff -u opental/PlacelessTranslationService/PlacelessTranslationService.py:1.11 
opental/PlacelessTranslationService/PlacelessTranslationService.py:1.12
--- opental/PlacelessTranslationService/PlacelessTranslationService.py:1.11     
Fri Feb 21 18:29:40 2003
+++ opental/PlacelessTranslationService/PlacelessTranslationService.py  Thu Feb 
27 14:04:50 2003
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 """Placeless Translation Service for providing I18n to file-based code.
 
-$Id: PlacelessTranslationService.py,v 1.11 2003/02/21 23:29:40 lalo Exp $
+$Id: PlacelessTranslationService.py,v 1.12 2003/02/27 19:04:50 lalo Exp $
 """
 
 import re, zLOG
@@ -204,8 +204,10 @@
         for string in to_replace:
             var = _get_var_regex.findall(string)[0]
             value = get(mapping, var)
-            if callable(value):
+            try:
                 value = value()
+            except (TypeError, AttributeError):
+                pass
             if value is None:
                 value = string
             if type(value) not in (StringType, UnicodeType):