[Zope3-checkins] CVS: Zope3/src/zope/app/pagetemplate - engine.py:1.1.2.2

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv1322

Modified Files:
      Tag: NameGeddon-branch
	engine.py 
Log Message:
- re-organize imports
- whitespace normalization


=== Zope3/src/zope/app/pagetemplate/engine.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/pagetemplate/engine.py:1.1.2.1	Mon Dec 23 14:31:56 2002
+++ Zope3/src/zope/app/pagetemplate/engine.py	Tue Dec 24 11:07:29 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """Expression engine configuration and registration.
 
@@ -19,18 +19,21 @@
 """
 __metaclass__ = type # All classes are new style when run with Python 2.2+
 
-from zope.pagetemplate.tales \
-     import ExpressionEngine, RegistrationError, Context
+import sys
+
 from zope.pagetemplate.expressions \
      import PathExpr, StringExpr, NotExpr, DeferExpr
 from zope.pagetemplate.pythonexpr import PythonExpr
-from zope.security.proxy import ProxyFactory
+from zope.pagetemplate.tales \
+     import ExpressionEngine, RegistrationError, Context
+
 from zope.app.interfaces.traversing.traverser import ITraverser
-from zope.security.restrictedbuiltins import RestrictedBuiltins
-from zope.proxy.introspection import removeAllProxies
-from zope.i18n.globaltranslationservice import translationService
 from zope.app.traversing.traverser import Traverser
-import sys
+from zope.i18n.globaltranslationservice import translationService
+from zope.proxy.introspection import removeAllProxies
+from zope.security.proxy import ProxyFactory
+from zope.security.restrictedbuiltins import RestrictedBuiltins
+
 
 def zopeTraverser(object, path_items, econtext):
     """Traverses a sequence of names, first trying attributes then items.
@@ -62,7 +65,7 @@
     def translate(self, domain, msgid, mapping):
         return translationService.translate(domain, msgid, mapping,
                                             self.request)
-    
+
 
 class ZopeEngine(ExpressionEngine):
 
@@ -72,7 +75,7 @@
                 namespace.update(__namespace)
             else:
                 namespace = __namespace
-                
+
         context = ZopeContext(self, namespace)
 
         # Put request into context so path traversal can find it
@@ -95,10 +98,9 @@
 Engine = Engine()
 
 class AppPT:
-    
+
     # Use our special engine
     pt_getEngineContext = Engine.getContext
-    
+
     def pt_getEngine(self):
         return Engine
-