more ZPT porting tweaks

Author: Richard Jones

CHANGES.txt

@@ -5,6 +5,7 @@ are given with the most recent entry first.
 Feature:
 - added MD5 scheme for password hiding
 - added support for HTTP charset selection
+- implement __nonzero__ for HTMLProperty
 
 
 2004-05-?? 0.7.3

roundup/cgi/PageTemplates/Expressions.py

@@ -21,7 +21,7 @@
 for Python expressions, string literals, and paths.
 """
 
-__version__='$Revision: 1.10 $'[11:-2]
+__version__='$Revision: 1.11 $'[11:-2]
 
 import re, sys
 from TALES import Engine, CompilerError, _valid_name, NAME_RE, \
@@ -278,6 +278,12 @@ def __call__(self, econtext):
     def __repr__(self):
         return 'defer:%s' % `self._s`
 
+class TraversalError:
+    def __init__(self, path, name):
+        self.path = path
+        self.name = name
+
+
 
 def restrictedTraverse(object, path, securityManager,
                        get=getattr, has=hasattr, N=None, M=[],
@@ -288,8 +294,10 @@ def restrictedTraverse(object, path, securityManager,
     path.reverse()
     validate = securityManager.validate
     __traceback_info__ = REQUEST
+    done = []
     while path:
         name = path.pop()
+        __traceback_info__ = TraversalError(done, name)
 
         if isinstance(name, TupleType):
             object = object(*name)
@@ -328,6 +336,7 @@ def restrictedTraverse(object, path, securityManager,
                     # XXX This is sooooo ugly.
                     guarded_getattr(object, name)
                 raise
+        done.append((name, o))
         object = o
 
     return object

roundup/cgi/PageTemplates/GlobalTranslationService.py

@@ -16,11 +16,13 @@
 # 2. make imports use roundup.cgi
 """Global Translation Service for providing I18n to Page Templates.
 
-$Id: GlobalTranslationService.py,v 1.1 2004-05-21 05:58:48 richard Exp $
+$Id: GlobalTranslationService.py,v 1.2 2004-05-21 06:13:39 richard Exp $
 """
 
 import re
 
+from roundup.i18n import _
+
 from roundup.cgi.TAL.TALDefs import NAME_RE
 
 ustr = str
@@ -29,6 +31,7 @@ class DummyTranslationService:
     """Translation service that doesn't know anything about translation."""
     def translate(self, domain, msgid, mapping=None,
                   context=None, target_language=None, default=None):
+        return str(msgid).upper()
         def repl(m, mapping=mapping):
             return ustr(mapping[m.group(m.lastindex)])
         cre = re.compile(r'\$(?:(%s)|\{(%s)\})' % (NAME_RE, NAME_RE))

roundup/cgi/TAL/talgettext.py

@@ -36,13 +36,13 @@
 import getopt
 import traceback
 
-from TAL.HTMLTALParser import HTMLTALParser
-from TAL.TALInterpreter import TALInterpreter
-from TAL.DummyEngine import DummyEngine
+from roundup.cgi.TAL.HTMLTALParser import HTMLTALParser
+from roundup.cgi.TAL.TALInterpreter import TALInterpreter
+from roundup.cgi.TAL.DummyEngine import DummyEngine
 #from ITALES import ITALESEngine
-from TAL.TALDefs import TALESError
+from roundup.cgi.TAL.TALDefs import TALESError
 
-__version__ = '$Revision: 1.1 $'
+__version__ = '$Revision: 1.2 $'
 
 pot_header = '''\
 # SOME DESCRIPTIVE TITLE.