[Checkins] SVN: Zope/trunk/ Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``.

[Tres Seaver]

Log message for revision 100381:
  Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``.
  
  o Uupdate versions for new location:
  
    - zope.pagetemplate==3.5.0
    - zope.app.pagetemplate==3.7.0
    - zope.app.publisher==3.8.1
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Products/PageTemplates/Expressions.py
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2009-05-25 19:54:55 UTC (rev 100380)
+++ Zope/trunk/doc/CHANGES.rst	2009-05-25 20:49:45 UTC (rev 100381)
@@ -11,6 +11,10 @@
 Restructuring
 +++++++++++++
 
+- Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``.
+  (update to versions 3.5.0 and 3.7.0, respectively, along with version 3.8.1
+  of ``zope.app.publisher``).
+
 - Use ``IBrowserView`` interface from ``zope.browser.interfaces``, rather than
   ``zope.publisher.interfaces.browser``.
 

Modified: Zope/trunk/src/Products/PageTemplates/Expressions.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/Expressions.py	2009-05-25 19:54:55 UTC (rev 100380)
+++ Zope/trunk/src/Products/PageTemplates/Expressions.py	2009-05-25 20:49:45 UTC (rev 100381)
@@ -23,21 +23,25 @@
 from zope.component import queryUtility
 from zope.i18n import translate
 from zope.interface import implements
+from zope.pagetemplate.engine import ZopeEngine as Z3Engine
+from zope.proxy import removeAllProxies
+from zope.tales.expressions import DeferExpr
+from zope.tales.expressions import NotExpr
+from zope.tales.expressions import PathExpr
+from zope.tales.expressions import StringExpr
+from zope.tales.expressions import Undefs
+from zope.tales.pythonexpr import PythonExpr
 from zope.tales.tales import Context
 from zope.tales.tales import ErrorInfo as BaseErrorInfo
 from zope.tales.tales import Iterator
-from zope.tales.expressions import PathExpr, StringExpr, NotExpr
-from zope.tales.expressions import DeferExpr, Undefs
-from zope.tales.pythonexpr import PythonExpr
 from zope.traversing.interfaces import ITraversable
 from zope.traversing.adapters import traversePathElement
-from zope.proxy import removeAllProxies
-from zope.app.pagetemplate.engine import ZopeEngine as Z3Engine
 
 import OFS.interfaces
 from MultiMapping import MultiMapping
 from Acquisition import aq_base
-from zExceptions import NotFound, Unauthorized
+from zExceptions import NotFound
+from zExceptions import Unauthorized
 
 from zope.contentprovider.tales import TALESProviderExpression
 from Products.PageTemplates import ZRPythonExpr

Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg	2009-05-25 19:54:55 UTC (rev 100380)
+++ Zope/trunk/versions.cfg	2009-05-25 20:49:45 UTC (rev 100381)
@@ -54,10 +54,10 @@
 zope.app.intid = 3.7.0
 zope.app.locales = 3.5.1
 zope.app.localpermission = 3.7.0
-zope.app.pagetemplate = 3.6.0
+zope.app.pagetemplate = 3.7.0
 zope.app.principalannotation = 3.6.1
 zope.app.publication = 3.7.0
-zope.app.publisher = 3.8.0
+zope.app.publisher = 3.8.1
 zope.app.renderer = 3.5.0
 zope.app.schema = 3.5.0
 zope.app.security = 3.7.0
@@ -108,7 +108,7 @@
 zope.location = 3.5.4
 zope.minmax = 1.1.0
 zope.password = 3.5.1
-zope.pagetemplate = 3.4.2
+zope.pagetemplate = 3.5.0
 zope.principalannotation = 3.6.0
 zope.principalregistry = 3.7.0
 zope.processlifetime = 1.0