[Checkins] SVN: zope.pagetemplate/trunk/s fix dependencies (thanks to z3c.dependencychecker)

[Godefroid Chapelle]

Log message for revision 106749:
  fix dependencies (thanks to z3c.dependencychecker)
  

Changed:
  U   zope.pagetemplate/trunk/setup.py
  U   zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py

-=-
Modified: zope.pagetemplate/trunk/setup.py
===================================================================
--- zope.pagetemplate/trunk/setup.py	2009-12-18 10:40:46 UTC (rev 106748)
+++ zope.pagetemplate/trunk/setup.py	2009-12-18 10:50:06 UTC (rev 106749)
@@ -62,17 +62,18 @@
       namespace_packages=['zope'],
       extras_require=dict(
           test=['zope.testing',
-                'zope.component',
                 'zope.proxy',
-                'zope.traversing',
                 'zope.security',
-                'RestrictedPython',
                 ]),
       install_requires=['setuptools',
                         'zope.interface',
+                        'zope.component',
                         'zope.security [untrustedpython]',
                         'zope.tales',
                         'zope.tal',
+                        'zope.i18n',
+                        'zope.i18nmessageid',
+                        'zope.traversing',
                        ],
       include_package_data=True,
       zip_safe=False,

Modified: zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py	2009-12-18 10:40:46 UTC (rev 106748)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py	2009-12-18 10:50:06 UTC (rev 106749)
@@ -37,7 +37,7 @@
 from zope.tales.pythonexpr import PythonExpr
 from zope.tales.tales import ExpressionEngine, Context
 
-from i18n import ZopeMessageFactory as _
+from zope.pagetemplate.i18n import ZopeMessageFactory as _
 
 class InlineCodeError(Exception):
     pass
@@ -59,8 +59,8 @@
 
         while path_items:
             name = path_items.pop()
-            
-            # special-case dicts for performance reasons        
+
+            # special-case dicts for performance reasons
             if getattr(object, '__class__', None) == dict:
                 object = object[name]
             else:
@@ -143,10 +143,10 @@
         """evaluateMacro gets security-proxied macro programs when this
         is run with the zopeTraverser, and in other untrusted
         situations. This will cause evaluation to fail in
-        zope.tal.talinterpreter, which knows nothing of security proxies. 
+        zope.tal.talinterpreter, which knows nothing of security proxies.
         Therefore, this method removes any proxy from the evaluated
         expression.
-        
+
         >>> output = [('version', 'xxx'), ('mode', 'html'), ('other', 'things')]
         >>> def expression(context):
         ...     return ProxyFactory(output)