Commit bdb3057e authored by Martijn Pieters's avatar Martijn Pieters

Clean up indentation and trailing whitespace.

parent f90d18e7
......@@ -13,7 +13,7 @@
"""Global definitions"""
__version__='$Revision: 1.52 $'[11:-2]
__version__='$Revision: 1.53 $'[11:-2]
# Global constants: __replaceable__ flags:
NOT_REPLACEABLE = 0
......
......@@ -12,7 +12,7 @@
##############################################################################
"""Image object that is stored in a file"""
__version__='$Revision: 1.12 $'[11:-2]
__version__='$Revision: 1.13 $'[11:-2]
############################################################
......
......@@ -16,7 +16,7 @@
This product provides support for external methods, which allow
domain-specific customization of web environments.
"""
__version__='$Revision: 1.50 $'[11:-2]
__version__='$Revision: 1.51 $'[11:-2]
from Globals import Persistent, DTMLFile, MessageDialog, HTML
import OFS.SimpleItem, Acquisition
import AccessControl.Role, sys, os, stat, traceback
......
......@@ -11,8 +11,8 @@
#
##############################################################################
__doc__='''External Method Product Initialization
$Id: __init__.py,v 1.14 2001/11/28 15:50:59 matt Exp $'''
__version__='$Revision: 1.14 $'[11:-2]
$Id: __init__.py,v 1.15 2002/08/14 22:14:10 mj Exp $'''
__version__='$Revision: 1.15 $'[11:-2]
import ExternalMethod
......
......@@ -98,5 +98,3 @@ class ExternalMethod:
first argument.
"""
from math import sqrt
def testf(arg1, sqrt = sqrt):
return sqrt(arg1)
......@@ -13,6 +13,5 @@
##############################################################################
"""
$Id: __init__.py,v 1.3 2002/04/23 13:04:20 jim Exp $
$Id: __init__.py,v 1.4 2002/08/14 22:14:11 mj Exp $
"""
......@@ -14,7 +14,7 @@
"""
Revision information:
$Id: testExternalMethod.py,v 1.4 2002/04/24 00:20:15 jim Exp $
$Id: testExternalMethod.py,v 1.5 2002/08/14 22:14:11 mj Exp $
"""
import math, os
......
......@@ -10,8 +10,8 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
__rcs_id__='$Id: MIMETag.py,v 1.9 2002/03/11 15:54:38 andreasjung Exp $'
__version__='$Revision: 1.9 $'[11:-2]
__rcs_id__='$Id: MIMETag.py,v 1.10 2002/08/14 22:14:27 mj Exp $'
__version__='$Revision: 1.10 $'[11:-2]
from DocumentTemplate.DT_Util import *
from DocumentTemplate.DT_String import String
......@@ -175,8 +175,3 @@ class MIMETag:
String.commands['mime'] = MIMETag
......@@ -11,12 +11,7 @@
#
##############################################################################
__doc__='''MIMETools Product Initialization
$Id: __init__.py,v 1.2 2001/11/28 15:50:59 matt Exp $'''
__version__='$Revision: 1.2 $'[11:-2]
$Id: __init__.py,v 1.3 2002/08/14 22:14:27 mj Exp $'''
__version__='$Revision: 1.3 $'[11:-2]
import MIMETag
......@@ -11,8 +11,8 @@
#
##############################################################################
"""SMTP mail objects
$Id: MailHost.py,v 1.73 2002/08/12 21:50:31 jens Exp $"""
__version__ = "$Revision: 1.73 $"[11:-2]
$Id: MailHost.py,v 1.74 2002/08/14 22:14:51 mj Exp $"""
__version__ = "$Revision: 1.74 $"[11:-2]
from Globals import Persistent, DTMLFile, InitializeClass
from smtplib import SMTP
......
......@@ -10,8 +10,8 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
__rcs_id__='$Id: SendMailTag.py,v 1.16 2002/03/11 15:54:38 andreasjung Exp $'
__version__='$Revision: 1.16 $'[11:-2]
__rcs_id__='$Id: SendMailTag.py,v 1.17 2002/08/14 22:14:51 mj Exp $'
__version__='$Revision: 1.17 $'[11:-2]
from MailHost import MailBase
from DocumentTemplate.DT_Util import parse_params,render_blocks
......
......@@ -11,8 +11,8 @@
#
##############################################################################
__doc__='''MailHost Product Initialization
$Id: __init__.py,v 1.21 2001/11/28 15:50:59 matt Exp $'''
__version__='$Revision: 1.21 $'[11:-2]
$Id: __init__.py,v 1.22 2002/08/14 22:14:51 mj Exp $'''
__version__='$Revision: 1.22 $'[11:-2]
import MailHost
import SendMailTag
......
......@@ -54,6 +54,3 @@ class MailHost:
are 'base64', 'quoted-printable' and 'uuencode'.
"""
......@@ -57,4 +57,3 @@ def main():
if __name__ == '__main__':
main()
......@@ -12,7 +12,7 @@
##############################################################################
"""Version object"""
__version__='$Revision: 1.52 $'[11:-2]
__version__='$Revision: 1.53 $'[11:-2]
import Globals, time
from AccessControl.Role import RoleManager
......@@ -208,4 +208,3 @@ class Version(Persistent,Implicit,RoleManager,Item):
'version, because the version would no longer\n'
'be accessable.<p>\n'
% (v,v,v))
......@@ -11,8 +11,8 @@
#
##############################################################################
__doc__='''Object system core
$Id: __init__.py,v 1.36 2001/11/28 15:51:00 matt Exp $'''
__version__='$Revision: 1.36 $'[11:-2]
$Id: __init__.py,v 1.37 2002/08/14 22:16:04 mj Exp $'''
__version__='$Revision: 1.37 $'[11:-2]
import Version, OFS.Image, OFS.Folder, AccessControl.User
import OFS.DTMLMethod, OFS.DTMLDocument, OFS.PropertySheets
......
......@@ -68,4 +68,3 @@ class AuthenticatedUser:
Permission -- Always available
"""
......@@ -133,5 +133,3 @@ class DTMLDocument:
"""
__constructor__=manage_addDocument
......@@ -739,18 +739,3 @@ class DateTime:
Permission -- Always available
"""
......@@ -86,5 +86,3 @@ class File:
Permission -- 'View'
"""
......@@ -36,14 +36,3 @@ class Folder:
)
__constructor__ = manage_addFolder
......@@ -82,10 +82,3 @@ class Image:
Permission -- 'View'
"""
......@@ -73,4 +73,3 @@ class PropertyManager:
Permission -- 'Access contents information'
"""
......@@ -216,10 +216,3 @@ class PropertySheet:
Permission -- 'Manage Properties'
"""
......@@ -61,4 +61,3 @@ class PropertySheets:
Permission -- Python only
"""
......@@ -214,5 +214,3 @@ class Request:
Permissions -- Always available
"""
......@@ -172,4 +172,3 @@ class Response:
Permission -- Always available
"""
......@@ -13,7 +13,3 @@ math: Python 'math' module
module":http://www.python.org/doc/current/lib/module-math.html
documentation at Python.org
"""
......@@ -14,5 +14,3 @@ random: Python 'random' module
module":http://www.python.org/doc/current/lib/module-random.html
documentation at Python.org
"""
......@@ -77,7 +77,3 @@ def sort(seq, sort):
"Python cmp function":http://www.python.org/doc/lib/built-in-funcs.html
"""
......@@ -13,8 +13,3 @@ string: Python 'string' module
module":http://www.python.org/doc/current/lib/module-string.html
documentation at Python.org
"""
......@@ -17,7 +17,7 @@ Page Template-specific implementation of TALES, with handlers
for Python expressions, string literals, and paths.
"""
__version__='$Revision: 1.35 $'[11:-2]
__version__='$Revision: 1.36 $'[11:-2]
import re, sys
from TALES import Engine, CompilerError, _valid_name, NAME_RE, \
......
......@@ -15,7 +15,7 @@
HTML- and XML-based template objects using TAL, TALES, and METAL.
"""
__version__='$Revision: 1.24 $'[11:-2]
__version__='$Revision: 1.25 $'[11:-2]
import sys
......@@ -203,4 +203,3 @@ class PageTemplateTracebackSupplement:
if e:
w = list(w) + list(e)
self.warnings = w
......@@ -15,7 +15,7 @@
Zope object encapsulating a Page Template from the filesystem.
"""
__version__='$Revision: 1.18 $'[11:-2]
__version__='$Revision: 1.19 $'[11:-2]
import os, AccessControl, Acquisition, sys
from Globals import package_home, DevelopmentMode
......
......@@ -17,7 +17,7 @@ A TALES Iterator with the ability to use first() and last() on
subpaths of elements.
"""
__version__='$Revision: 1.3 $'[11:-2]
__version__='$Revision: 1.4 $'[11:-2]
import TALES
from Expressions import restrictedTraverse, Undefs, getSecurityManager
......
......@@ -14,7 +14,7 @@
"""Generic Python Expression Handler
"""
__version__='$Revision: 1.7 $'[11:-2]
__version__='$Revision: 1.8 $'[11:-2]
from TALES import CompilerError
from sys import exc_info
......@@ -78,4 +78,3 @@ class ExprTypeProxy:
def __call__(self, text):
return self._handler(self._name, text,
self._econtext._engine)(self._econtext)
......@@ -15,7 +15,7 @@
An implementation of a generic TALES engine
"""
__version__='$Revision: 1.30 $'[11:-2]
__version__='$Revision: 1.31 $'[11:-2]
import re, sys, ZTUtils
from MultiMapping import MultiMapping
......@@ -282,4 +282,3 @@ class SimpleExpr:
return self._name, self._expr
def __repr__(self):
return '<SimpleExpr %s %s>' % (self._name, `self._expr`)
......@@ -17,7 +17,7 @@ Handler for Python expressions, using the pre-Python 2.1 restriction
machinery from PythonScripts.
"""
__version__='$Revision: 1.7 $'[11:-2]
__version__='$Revision: 1.8 $'[11:-2]
from AccessControl import getSecurityManager
from Products.PythonScripts.Guarded import _marker, \
......
......@@ -16,7 +16,7 @@
Handler for Python expressions that uses the RestrictedPython package.
"""
__version__='$Revision: 1.9 $'[11:-2]
__version__='$Revision: 1.10 $'[11:-2]
from AccessControl import full_read_guard, full_write_guard, \
safe_builtins, getSecurityManager
......
......@@ -15,7 +15,7 @@
Zope object encapsulating a Page Template.
"""
__version__='$Revision: 1.41 $'[11:-2]
__version__='$Revision: 1.42 $'[11:-2]
import os, AccessControl, Acquisition, sys
from types import StringType
......@@ -368,4 +368,3 @@ def initialize(context):
)
context.registerHelp()
context.registerHelpTitle('Zope Help')
......@@ -15,7 +15,7 @@ __doc__='''Package wrapper for Page Templates
This wrapper allows the Page Template modules to be segregated in a
separate package.
$Id: __init__.py,v 1.3 2001/11/28 15:51:01 matt Exp $'''
$Id: __init__.py,v 1.4 2002/08/14 22:17:24 mj Exp $'''
__version__='$$'[11:-2]
......
......@@ -34,4 +34,3 @@ class harness2(harness1):
assert aargs == args, "Harness method arguments"
assert akwargs == kwargs, "Harness method keyword args"
return result
......@@ -140,4 +140,3 @@ def test_suite():
if __name__=='__main__':
main()
......@@ -130,4 +130,3 @@ def test_suite():
if __name__=='__main__':
main()
......@@ -11,7 +11,7 @@
#
##############################################################################
"""$Id: DateIndex.py,v 1.6 2002/07/30 16:25:46 shane Exp $
"""$Id: DateIndex.py,v 1.7 2002/08/14 22:19:27 mj Exp $
"""
from DateTime.DateTime import DateTime
......@@ -201,4 +201,3 @@ def manage_addDateIndex( self, id, REQUEST=None, RESPONSE=None, URL3=None):
"""Add a Date index"""
return self.manage_addIndex(id, 'DateIndex', extra=None, \
REQUEST=REQUEST, RESPONSE=RESPONSE, URL1=URL3)
......@@ -11,7 +11,7 @@
#
##############################################################################
"""$Id: DateRangeIndex.py,v 1.3 2002/06/26 13:37:19 caseman Exp $
"""$Id: DateRangeIndex.py,v 1.4 2002/08/14 22:19:28 mj Exp $
"""
from Products.PluginIndexes import PluggableIndex
......
......@@ -13,7 +13,7 @@
"""Simple column indices
$Id: FieldIndex.py,v 1.9 2002/06/20 20:00:34 jeremy Exp $
$Id: FieldIndex.py,v 1.10 2002/08/14 22:19:29 mj Exp $
"""
from Products.PluginIndexes import PluggableIndex
......@@ -47,4 +47,3 @@ def manage_addFieldIndex(self, id, REQUEST=None, RESPONSE=None, URL3=None):
"""Add a field index"""
return self.manage_addIndex(id, 'FieldIndex', extra=None, \
REQUEST=REQUEST, RESPONSE=RESPONSE, URL1=URL3)
......@@ -122,4 +122,3 @@ def manage_addKeywordIndex(self, id, REQUEST=None, RESPONSE=None, URL3=None):
"""Add a keyword index"""
return self.manage_addIndex(id, 'KeywordIndex', extra=None, \
REQUEST=REQUEST, RESPONSE=RESPONSE, URL1=URL3)
......@@ -11,7 +11,7 @@
#
##############################################################################
__version__ = '$Id: PathIndex.py,v 1.24 2002/06/20 20:07:20 jeremy Exp $'
__version__ = '$Id: PathIndex.py,v 1.25 2002/08/14 22:19:31 mj Exp $'
from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest
......
......@@ -270,4 +270,3 @@ class GlobbingLexicon(Lexicon):
result = result.replace( '?', '.')
return "%s$" % result
......@@ -218,4 +218,3 @@ stop_words=(
)
stop_word_dict={}
for word in stop_words: stop_word_dict[word]=None
......@@ -31,6 +31,3 @@ def getSplitter(name=None):
exec( "from %s.%s import %s" % (name,name,name))
return vars()[name]
......@@ -14,7 +14,7 @@
"""Text Index
"""
__version__ = '$Revision: 1.33 $'[11:-2]
__version__ = '$Revision: 1.34 $'[11:-2]
import re
......@@ -767,4 +767,3 @@ manage_addTextIndexForm = DTMLFile('dtml/addTextIndex', globals())
def manage_addTextIndex(self, id, extra=None, REQUEST=None, RESPONSE=None, URL3=None):
"""Add a text index"""
return self.manage_addIndex(id, 'TextIndex', extra, REQUEST, RESPONSE, URL3)
......@@ -131,4 +131,3 @@ class Vocabulary(Item, Persistent, Implicit,
def words(self):
return self.lexicon._lexicon.items()
......@@ -294,4 +294,3 @@ if __name__=='__main__':
globals()[sys.argv[1]]()
else:
main()
......@@ -11,7 +11,7 @@
#
##############################################################################
__version__ = '$Id: FilteredSet.py,v 1.3 2002/03/11 14:53:05 andreasjung Exp $'
__version__ = '$Id: FilteredSet.py,v 1.4 2002/08/14 22:19:34 mj Exp $'
from BTrees.IIBTree import IISet
from Persistence import Persistent
......
......@@ -11,7 +11,7 @@
#
##############################################################################
__version__ = '$Id: TopicIndex.py,v 1.8 2002/04/25 12:44:02 andreasjung Exp $'
__version__ = '$Id: TopicIndex.py,v 1.9 2002/08/14 22:19:34 mj Exp $'
from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest
......
......@@ -10,4 +10,3 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
......@@ -143,4 +143,3 @@ def main():
if __name__ == '__main__':
main()
......@@ -12,7 +12,7 @@
##############################################################################
"""Pluggable Index Base Class """
__version__='$Revision: 1.6 $'[11:-2]
__version__='$Revision: 1.7 $'[11:-2]
import Interface
......@@ -67,4 +67,3 @@ class PluggableIndexInterface(Interface.Base):
records. The second object is a tuple containing the names of
all data fields used.
"""
......@@ -92,4 +92,3 @@ class ResultList:
return self.__class__(
result, union(self._words, x._words), self._index)
......@@ -13,7 +13,7 @@
"""Simple column indices"""
__version__='$Revision: 1.13 $'[11:-2]
__version__='$Revision: 1.14 $'[11:-2]
from Globals import Persistent
from Acquisition import Implicit
......@@ -425,4 +425,3 @@ class UnIndex(Persistent, Implicit, SimpleItem):
v = IISet((v,))
items.append((k, v))
return items
......@@ -11,7 +11,7 @@
#
#############################################################################
__version__ = '$Id: util.py,v 1.9 2002/03/29 15:33:03 andreasjung Exp $'
__version__ = '$Id: util.py,v 1.10 2002/08/14 22:19:34 mj Exp $'
import re
......
......@@ -254,5 +254,3 @@ class DocBookBook:
def __str__(self):
return self.read()
......@@ -945,4 +945,3 @@ class DocumentClass:
return (StructuredTextXref(s[start:end]), start-1, end+1)
else:
return None
......@@ -64,4 +64,3 @@ class DocumentWithImages(DocumentClass):
start, end)
return None
......@@ -28,4 +28,3 @@ class HTMLWithImages(HTMLClass):
output('<img src="%s" alt="%s">\n' % (doc.href, doc.getNodeValue()))
if doc.getNodeValue() and hasattr(doc, 'key'):
output('<p><b>Figure %s</b> %s</p>\n' % (doc.key, doc.getNodeValue()))
......@@ -14,4 +14,3 @@ dbl_quoted_punc = punc_func("\"")
strongem_punc = punc_func('*')
under_punc = punc_func('_<>')
phrase_delimiters = r'\s\.\,\?\/\!\&\(\)'
......@@ -78,4 +78,3 @@ if __name__=='__main__':
for f in args:
print HTML(open(f).read())
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment