[Zope3-checkins] CVS: Zope3/src/zope/pagetemplate - __init__.py:1.1.2.2 engine.py:1.1.2.2 expressions.py:1.1.2.2 interfaces.py:1.1.2.3 iterator.py:1.1.2.2 pagetemplatefile.py:1.1.2.2 pythonexpr.py:1.1.2.2 safemapping.py:1.1.2.2
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:42 -0500
Update of /cvs-repository/Zope3/src/zope/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/pagetemplate
Modified Files:
Tag: NameGeddon-branch
__init__.py engine.py expressions.py interfaces.py iterator.py
pagetemplatefile.py pythonexpr.py safemapping.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/pagetemplate/__init__.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/__init__.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/__init__.py Tue Dec 24 21:21:10 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
-#
+#
##############################################################################
"""Zope 3 compatible ZTUtils."""
=== Zope3/src/zope/pagetemplate/engine.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/engine.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/engine.py Tue Dec 24 21:21:10 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.
@@ -36,4 +36,3 @@
return e
Engine = Engine()
-
=== Zope3/src/zope/pagetemplate/expressions.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/expressions.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/expressions.py Tue Dec 24 21:21:10 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
-#
+#
##############################################################################
"""Basic Page Template expression types.
@@ -186,7 +186,7 @@
parts.append(exp)
expr = ''.join(parts)
self._expr = expr
-
+
def __call__(self, econtext):
vvals = []
for var in self._vars:
@@ -229,7 +229,7 @@
def __init__(self, name, expr, compiler):
self._s = expr = expr.lstrip()
self._c = compiler.compile(expr)
-
+
def __call__(self, econtext):
return DeferWrapper(self._c, econtext)
@@ -245,4 +245,3 @@
for name in path[1:]:
mod = getattr(mod, name)
return mod
-
=== Zope3/src/zope/pagetemplate/interfaces.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/pagetemplate/interfaces.py:1.1.2.2 Mon Dec 23 15:49:27 2002
+++ Zope3/src/zope/pagetemplate/interfaces.py Tue Dec 24 21:21:11 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.
-#
+#
##############################################################################
"""Interface that describes the 'macros' attribute of a PageTemplate.
@@ -21,4 +21,3 @@
macros = Attribute("An object that implements the __getitem__ "
"protocol, containing page template macros.")
-
=== Zope3/src/zope/pagetemplate/iterator.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/iterator.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/iterator.py Tue Dec 24 21:21:11 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
-#
+#
##############################################################################
__doc__='''Iterator class
@@ -20,7 +20,7 @@
'''Simple Iterator class'''
__allow_access_to_unprotected_subobjects__ = 1
-
+
def __init__(self, seq):
self.seq = seq
self.nextIndex = 0
@@ -78,4 +78,3 @@
def length(self):
return len(self.seq)
-
=== Zope3/src/zope/pagetemplate/pagetemplatefile.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/pagetemplatefile.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/pagetemplatefile.py Tue Dec 24 21:21:11 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
-#
+#
##############################################################################
"""Filesystem Page Template module
@@ -39,7 +39,7 @@
if _prefix is None:
_prefix = sys._getframe(1).f_globals
_prefix = package_home(_prefix)
-
+
self.filename = os.path.join(_prefix, filename)
def _cook_check(self):
=== Zope3/src/zope/pagetemplate/pythonexpr.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/pythonexpr.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/pythonexpr.py Tue Dec 24 21:21:11 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
-#
+#
##############################################################################
"""Generic Python Expression Handler"""
=== Zope3/src/zope/pagetemplate/safemapping.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/pagetemplate/safemapping.py:1.1.2.1 Mon Dec 23 14:32:58 2002
+++ Zope3/src/zope/pagetemplate/safemapping.py Tue Dec 24 21:21:11 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 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.
-#
+#
##############################################################################
"""Simple variation of MultiMapping used to support layers of variable
declarations in TAL."""