Commit 2639fcb7 authored by Martijn Pieters's avatar Martijn Pieters

Clean up indentation and trailing whitespace.

parent bdb3057e
......@@ -12,7 +12,7 @@
##############################################################################
"""HTML formated DocumentTemplates
$Id: DT_HTML.py,v 1.31 2001/11/28 15:50:54 matt Exp $"""
$Id: DT_HTML.py,v 1.32 2002/08/14 22:29:52 mj Exp $"""
from DT_String import String, FileMixin
import DT_String, re
......
......@@ -75,8 +75,8 @@ __doc__='''Conditional insertion
variable is not reevaluated.
'''
__rcs_id__='$Id: DT_If.py,v 1.18 2001/11/28 15:50:54 matt Exp $'
__version__='$Revision: 1.18 $'[11:-2]
__rcs_id__='$Id: DT_If.py,v 1.19 2002/08/14 22:29:52 mj Exp $'
__version__='$Revision: 1.19 $'[11:-2]
from DT_Util import ParseError, parse_params, name_param, str
......
......@@ -331,8 +331,8 @@
''' #'
__rcs_id__='$Id: DT_In.py,v 1.59 2002/05/07 17:55:37 htrd Exp $'
__version__='$Revision: 1.59 $'[11:-2]
__rcs_id__='$Id: DT_In.py,v 1.60 2002/08/14 22:29:52 mj Exp $'
__version__='$Revision: 1.60 $'[11:-2]
import sys
from DT_Util import ParseError, parse_params, name_param, str, join_unicode
......
......@@ -13,8 +13,8 @@
__doc__='''Sequence variables support
$Id: DT_InSV.py,v 1.21 2001/11/28 15:50:54 matt Exp $'''
__version__='$Revision: 1.21 $'[11:-2]
$Id: DT_InSV.py,v 1.22 2002/08/14 22:29:52 mj Exp $'''
__version__='$Revision: 1.22 $'[11:-2]
from math import sqrt
import re
......
......@@ -108,4 +108,3 @@ def parse_let_params(text,
text=text[l:].strip()
if text: return apply(parse_let_params,(text,result,tag),parms)
else: return result
......@@ -23,8 +23,8 @@
<!--#/if-->
'''
__rcs_id__='$Id: DT_Raise.py,v 1.12 2001/11/28 15:50:55 matt Exp $'
__version__='$Revision: 1.12 $'[11:-2]
__rcs_id__='$Id: DT_Raise.py,v 1.13 2002/08/14 22:29:52 mj Exp $'
__version__='$Revision: 1.13 $'[11:-2]
from DT_Util import parse_params, name_param, render_blocks, str
......
......@@ -10,7 +10,7 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
__version__='$Revision: 1.6 $'[11:-2]
__version__='$Revision: 1.7 $'[11:-2]
from DT_Util import parse_params, name_param, str
import sys
......
......@@ -10,7 +10,7 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
"$Id: DT_String.py,v 1.50 2002/08/01 16:00:39 mj Exp $"
"$Id: DT_String.py,v 1.51 2002/08/14 22:29:52 mj Exp $"
import thread,re,exceptions,os
......
......@@ -12,8 +12,8 @@
##############################################################################
__doc__='''Machinery to support through-the-web editing
$Id: DT_UI.py,v 1.11 2001/11/28 15:50:55 matt Exp $'''
__version__='$Revision: 1.11 $'[11:-2]
$Id: DT_UI.py,v 1.12 2002/08/14 22:29:52 mj Exp $'''
__version__='$Revision: 1.12 $'[11:-2]
from DT_HTML import HTML
......
......@@ -10,8 +10,8 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
'''$Id: DT_Util.py,v 1.87 2002/08/01 16:00:39 mj Exp $'''
__version__='$Revision: 1.87 $'[11:-2]
'''$Id: DT_Util.py,v 1.88 2002/08/14 22:29:52 mj Exp $'''
__version__='$Revision: 1.88 $'[11:-2]
import re, os
from html_quote import html_quote, ustr # for import by other modules, dont remove!
......
......@@ -151,8 +151,8 @@ Evaluating expressions without rendering results
''' # '
__rcs_id__='$Id: DT_Var.py,v 1.56 2002/08/14 16:34:20 rdmurray Exp $'
__version__='$Revision: 1.56 $'[11:-2]
__rcs_id__='$Id: DT_Var.py,v 1.57 2002/08/14 22:29:52 mj Exp $'
__version__='$Revision: 1.57 $'[11:-2]
from DT_Util import parse_params, name_param, str, ustr
import os, string, re, sys
......
......@@ -33,8 +33,8 @@
'''
__rcs_id__='$Id: DT_With.py,v 1.14 2001/11/28 15:50:55 matt Exp $'
__version__='$Revision: 1.14 $'[11:-2]
__rcs_id__='$Id: DT_With.py,v 1.15 2002/08/14 22:29:52 mj Exp $'
__version__='$Revision: 1.15 $'[11:-2]
from DT_Util import parse_params, name_param, InstanceDict, render_blocks, str
from DT_Util import TemplateDict
......
......@@ -13,8 +13,8 @@
__doc__='''short description
$Id: DTtestExpr.py,v 1.7 2001/11/28 15:50:55 matt Exp $'''
__version__='$Revision: 1.7 $'[11:-2]
$Id: DTtestExpr.py,v 1.8 2002/08/14 22:29:52 mj Exp $'''
__version__='$Revision: 1.8 $'[11:-2]
from DocumentTemplate import *
import sys
......
......@@ -105,7 +105,7 @@ Document Templates may be created 4 ways:
'''
__version__='$Revision: 1.13 $'[11:-2]
__version__='$Revision: 1.14 $'[11:-2]
ParseError='Document Template Parse Error'
......
......@@ -7,4 +7,3 @@ def careful_mul(env, *factors):
for factor in factors:
r=r*factor
return r
......@@ -15,8 +15,8 @@ __doc__='''Package wrapper for Document Template
This wrapper allows the (now many) document template modules to be
segregated in a separate package.
$Id: __init__.py,v 1.16 2001/11/28 15:50:55 matt Exp $'''
__version__='$Revision: 1.16 $'[11:-2]
$Id: __init__.py,v 1.17 2002/08/14 22:29:53 mj Exp $'''
__version__='$Revision: 1.17 $'[11:-2]
import ExtensionClass # work-around for import bug.
from DocumentTemplate import String, File, HTML, HTMLDefault, HTMLFile
......@@ -5,4 +5,3 @@ from ustr import ustr
def html_quote(v, name='(Unknown name)', md={}):
return escape(ustr(v), 1)
......@@ -13,8 +13,8 @@
__doc__='''Python implementations of document template some features
$Id: pDocumentTemplate.py,v 1.35 2002/03/27 10:14:02 htrd Exp $'''
__version__='$Revision: 1.35 $'[11:-2]
$Id: pDocumentTemplate.py,v 1.36 2002/08/14 22:29:53 mj Exp $'''
__version__='$Revision: 1.36 $'[11:-2]
import sys, types
......
......@@ -14,7 +14,7 @@
Advanced sort support by Oleg Broytmann <phd@@phd.pp.ru> 23 Apr 2001
eg Sort(sequence, (("akey", "nocase"), ("anotherkey", "cmp", "desc")))
$Id: SortEx.py,v 1.4 2002/02/07 17:47:42 andreasjung Exp $
$Id: SortEx.py,v 1.5 2002/08/14 22:29:53 mj Exp $
"""
......@@ -219,5 +219,3 @@ class SortBy:
# all functions returned 0 - identical sequences
return 0
class standard_html: # Base class for using with ZTemplates
def __init__(self, title):
self.standard_html_header = """<HTML>
......
......@@ -13,8 +13,8 @@
"""Document Template Tests
"""
__rcs_id__='$Id: testDTML.py,v 1.13 2002/08/14 15:46:58 chrism Exp $'
__version__='$Revision: 1.13 $'[11:-2]
__rcs_id__='$Id: testDTML.py,v 1.14 2002/08/14 22:29:53 mj Exp $'
__version__='$Revision: 1.14 $'[11:-2]
import sys, os
import unittest
......
......@@ -13,8 +13,8 @@
"""Document Template Tests
"""
__rcs_id__='$Id: testDTMLUnicode.py,v 1.2 2002/03/27 10:14:02 htrd Exp $'
__version__='$Revision: 1.2 $'[11:-2]
__rcs_id__='$Id: testDTMLUnicode.py,v 1.3 2002/08/14 22:29:53 mj Exp $'
__version__='$Revision: 1.3 $'[11:-2]
import sys, os
import unittest
......
......@@ -13,8 +13,8 @@
"""Document Template Tests
"""
__rcs_id__='$Id: testustr.py,v 1.2 2002/03/27 10:14:02 htrd Exp $'
__version__='$Revision: 1.2 $'[11:-2]
__rcs_id__='$Id: testustr.py,v 1.3 2002/08/14 22:29:53 mj Exp $'
__version__='$Revision: 1.3 $'[11:-2]
import sys, os
import unittest
......
......@@ -17,7 +17,7 @@ This product provides support for Script objects containing restricted
Python code.
"""
__version__='$Revision: 1.42 $'[11:-2]
__version__='$Revision: 1.43 $'[11:-2]
import sys, os, traceback, re, marshal
from Globals import DTMLFile, MessageDialog, package_home
......
......@@ -13,7 +13,7 @@
"""Utility module for making simple security assertions for
Python scripts."""
__version__='$Revision: 1.5 $'[11:-2]
__version__='$Revision: 1.6 $'[11:-2]
# These have been relocated, and should be imported from AccessControl
......
......@@ -11,8 +11,8 @@
#
##############################################################################
__doc__='''Python Scripts Product Initialization
$Id: __init__.py,v 1.12 2002/06/20 14:48:38 Brian Exp $'''
__version__='$Revision: 1.12 $'[11:-2]
$Id: __init__.py,v 1.13 2002/08/14 22:25:08 mj Exp $'''
__version__='$Revision: 1.13 $'[11:-2]
import PythonScript
try:
......
......@@ -230,8 +230,3 @@ class PythonScript:
'text/plain' set on the RESPONSE.
"""
......@@ -65,8 +65,3 @@ from Globals import InitializeClass
# 'error_reply', 'error_temp', 'error_perm', 'error_proto')
# from httplib import NNTP
# allow_class(NNTP)
......@@ -18,7 +18,7 @@ Scripts. It can be accessed from Python with the statement
"import Products.PythonScripts.standard"
"""
__version__='$Revision: 1.8 $'[11:-2]
__version__='$Revision: 1.9 $'[11:-2]
from AccessControl import ModuleSecurityInfo, getSecurityManager
security = ModuleSecurityInfo()
......@@ -53,4 +53,3 @@ class DTML(RestrictedDTML, HTML):
finally: security.removeContext(self)
security.apply(globals())
......@@ -166,4 +166,3 @@ def main():
if __name__ == '__main__':
main()
......@@ -11,7 +11,7 @@
#
############################################################################
__version__='$Revision: 1.13 $'[11:-2]
__version__='$Revision: 1.14 $'[11:-2]
import Globals
from Persistence import Persistent
from ZODB import TimeStamp
......
......@@ -13,7 +13,7 @@
"""
Session initialization routines
$Id: __init__.py,v 1.6 2001/11/28 15:51:07 matt Exp $
$Id: __init__.py,v 1.7 2002/08/14 22:25:09 mj Exp $
"""
import ZODB # this is for testrunner to be happy
......
......@@ -216,4 +216,3 @@ def test_suite():
if __name__ == '__main__':
runner = TextTestRunner(verbosity=9, descriptions=9)
runner.run(test_suite())
......@@ -13,9 +13,9 @@
"""
Test suite for session id manager.
$Id: testBrowserIdManager.py,v 1.10 2002/08/10 19:28:38 chrism Exp $
$Id: testBrowserIdManager.py,v 1.11 2002/08/14 22:25:10 mj Exp $
"""
__version__ = "$Revision: 1.10 $"[11:-2]
__version__ = "$Revision: 1.11 $"[11:-2]
import sys
import ZODB
......
......@@ -229,4 +229,3 @@ def test_suite():
if __name__ == '__main__':
runner = TextTestRunner(verbosity=9, descriptions=9)
runner.run(test_suite())
......@@ -13,7 +13,7 @@
##############################################################################
"""Site error log module.
$Id: SiteErrorLog.py,v 1.9 2002/06/29 18:46:45 chrism Exp $
$Id: SiteErrorLog.py,v 1.10 2002/08/14 22:25:11 mj Exp $
"""
import os
......@@ -272,4 +272,3 @@ def manage_addErrorLog(dispatcher, RESPONSE=None):
RESPONSE.redirect(
dispatcher.DestinationURL() +
'/manage_main?manage_tabs_message=Error+Log+Added.' )
......@@ -13,7 +13,7 @@
##############################################################################
"""Site error log product.
$Id: __init__.py,v 1.2 2002/04/03 20:43:55 shane Exp $
$Id: __init__.py,v 1.3 2002/08/14 22:25:11 mj Exp $
"""
import SiteErrorLog
......@@ -23,4 +23,3 @@ def initialize(context):
constructors=(SiteErrorLog.manage_addErrorLog,),
permission=SiteErrorLog.use_error_logging,
icon='www/error.gif')
......@@ -43,5 +43,3 @@ class LowConflictConnection(Connection):
d=object.__dict__
for k,v in state.items(): d[k]=v
object._p_serial=serial
......@@ -22,9 +22,9 @@ lives in another ZODB.
To understand this fully, you'll need to read the source of
ZODB.Mount.MountPoint.
$Id: TemporaryFolder.py,v 1.6 2002/08/12 21:14:15 chrism Exp $
$Id: TemporaryFolder.py,v 1.7 2002/08/14 22:25:13 mj Exp $
"""
__version__='$Revision: 1.6 $'[11:-2]
__version__='$Revision: 1.7 $'[11:-2]
import Globals
from Globals import HTMLFile
......
......@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of
non-cyclic garbage and it does rudimentary conflict resolution. This is a
ripoff of Jim's Packless bsddb3 storage.
$Id: TemporaryStorage.py,v 1.9 2002/06/30 18:23:15 chrism Exp $
$Id: TemporaryStorage.py,v 1.10 2002/08/14 22:25:13 mj Exp $
"""
__version__ ='$Revision: 1.9 $'[11:-2]
__version__ ='$Revision: 1.10 $'[11:-2]
from zLOG import LOG, BLATHER
from ZODB.referencesf import referencesf
......@@ -268,9 +268,3 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
self._takeOutGarbage(oid)
finally:
self._lock_release()
......@@ -13,7 +13,7 @@
"""
Temporary Folder initialization routines
$Id: __init__.py,v 1.5 2002/01/11 14:53:38 chrism Exp $
$Id: __init__.py,v 1.6 2002/08/14 22:25:13 mj Exp $
"""
import ZODB # for testrunner to be happy
......
import ZODB
from ZODB.tests.MinPO import MinPO
from Products.TemporaryFolder import TemporaryStorage
......
......@@ -13,10 +13,10 @@
"""
Transient Object Container Class ('timeslice'-based design).
$Id: Transience.py,v 1.27 2002/08/07 14:48:48 chrism Exp $
$Id: Transience.py,v 1.28 2002/08/14 22:25:13 mj Exp $
"""
__version__='$Revision: 1.27 $'[11:-2]
__version__='$Revision: 1.28 $'[11:-2]
import Globals
from Globals import HTMLFile
......
......@@ -13,10 +13,10 @@
"""
Simple ZODB-based transient object implementation.
$Id: TransientObject.py,v 1.8 2002/06/24 19:31:16 chrism Exp $
$Id: TransientObject.py,v 1.9 2002/08/14 22:25:13 mj Exp $
"""
__version__='$Revision: 1.8 $'[11:-2]
__version__='$Revision: 1.9 $'[11:-2]
from Persistence import Persistent
from Acquisition import Implicit
......
......@@ -13,7 +13,7 @@
"""
Transience initialization routines
$Id: __init__.py,v 1.6 2001/11/28 15:51:09 matt Exp $
$Id: __init__.py,v 1.7 2002/08/14 22:25:13 mj Exp $
"""
import ZODB # this is to help out testrunner, don't remove.
......@@ -33,4 +33,3 @@ def initialize(context):
)
context.registerHelp()
context.registerHelpTitle('Zope Help')
......@@ -291,5 +291,3 @@ class MaxTransientObjectsExceeded:
from Products.Transience import MaxTransientObjectsExceeded
"""
......@@ -9,4 +9,3 @@ def time():
def sleep(duration):
""" False sleep -- sleep for 1/10 the time specifed """
origtime.sleep(duration / 10.0)
......@@ -130,4 +130,3 @@ data = {
if __name__ == '__main__':
runner = TextTestRunner(verbosity=9)
runner.run(test_suite())
......@@ -456,4 +456,3 @@ def test_suite():
if __name__ == '__main__':
runner = TextTestRunner(verbosity=9)
runner.run(test_suite())
......@@ -728,4 +728,3 @@ def mergeResults(r, has_sort_keys, reverse):
tmp.append(elt)
size += len(elt)
return LazyCat(tmp, size)
......@@ -135,12 +135,3 @@ class CatalogAware:
for item in obj.objectValues():
self.reindex_all(self, item)
return 'done!'
......@@ -133,11 +133,3 @@ class CatalogPathAware(CatalogAware):
nontrivial, we don't want to spend a lot of time on ZClasses, and
this works.
"""
......@@ -12,7 +12,7 @@
#
##############################################################################
"""
$Id: IZCatalog.py,v 1.2 2002/08/14 19:10:14 caseman Exp $
$Id: IZCatalog.py,v 1.3 2002/08/14 22:25:15 mj Exp $
"""
from Interface import Interface
......
......@@ -10,8 +10,8 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
__doc__='''$Id: Lazy.py,v 1.6 2001/11/28 15:51:09 matt Exp $'''
__version__='$Revision: 1.6 $'[11:-2]
__doc__='''$Id: Lazy.py,v 1.7 2002/08/14 22:25:15 mj Exp $'''
__version__='$Revision: 1.7 $'[11:-2]
class Lazy:
......
......@@ -11,7 +11,7 @@
#
##############################################################################
"""$Id: ZCatalogIndexes.py,v 1.7 2002/06/28 17:25:23 caseman Exp $
"""$Id: ZCatalogIndexes.py,v 1.8 2002/08/14 22:25:15 mj Exp $
"""
from Globals import DTMLFile, InitializeClass
......@@ -131,5 +131,3 @@ class OldCatalogWrapperObject(SimpleItem, Implicit):
def __init__(self, o):
self.index = o
......@@ -43,4 +43,3 @@ def initialize(context):
context.registerHelp()
context.registerHelpTitle('Zope Help')
......@@ -54,5 +54,3 @@ class Vocabulary:
Return list of words.
"""
......@@ -211,4 +211,3 @@ class ZCatalog:
"""
Search the catalog, the same way as 'searchResults'.
"""
......@@ -44,5 +44,3 @@ if __name__=="__main__":
k = Keywords()
k.build("/home/andreas/zope.mbox",1000)
......@@ -707,4 +707,3 @@ def pdebug():
if __name__ == '__main__':
main()
......@@ -239,4 +239,3 @@ if __name__=='__main__':
globals()[sys.argv[1]]()
else:
main()
......@@ -38,7 +38,7 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
__author__ = "Steve Purcell"
__email__ = "stephen_purcell@yahoo.com"
__version__ = "$Revision: 1.2 $"[11:-2]
__version__ = "$Revision: 1.3 $"[11:-2]
import time
import sys
......
......@@ -13,8 +13,8 @@
database_type='Gadfly'
__doc__='''%s Database Connection
$Id: DA.py,v 1.14 2002/05/27 12:27:25 chrisw Exp $''' % database_type
__version__='$Revision: 1.14 $'[11:-2]
$Id: DA.py,v 1.15 2002/08/14 22:25:17 mj Exp $''' % database_type
__version__='$Revision: 1.15 $'[11:-2]
from db import DB, manage_DataSources
import sys, DABase, Globals
......@@ -94,4 +94,3 @@ class Connection(DABase.Connection):
return self
finally:
_connections_lock.release()
......@@ -12,8 +12,8 @@
##############################################################################
__doc__='''Database Connection
$Id: DABase.py,v 1.11 2001/11/28 15:51:10 matt Exp $'''
__version__='$Revision: 1.11 $'[11:-2]
$Id: DABase.py,v 1.12 2002/08/14 22:25:17 mj Exp $'''
__version__='$Revision: 1.12 $'[11:-2]
from db import manage_DataSources
import Shared.DC.ZRDB.Connection, sys
......
......@@ -12,8 +12,8 @@
##############################################################################
__doc__='''Generic Database Adapter Package Registration
$Id: __init__.py,v 1.13 2001/11/28 15:51:10 matt Exp $'''
__version__='$Revision: 1.13 $'[11:-2]
$Id: __init__.py,v 1.14 2002/08/14 22:25:17 mj Exp $'''
__version__='$Revision: 1.14 $'[11:-2]
import Globals, os
......
......@@ -11,8 +11,8 @@
#
##############################################################################
'''$Id: db.py,v 1.12 2001/11/28 15:51:10 matt Exp $'''
__version__='$Revision: 1.12 $'[11:-2]
'''$Id: db.py,v 1.13 2002/08/14 22:25:17 mj Exp $'''
__version__='$Revision: 1.13 $'[11:-2]
import os
from string import strip, split
......
......@@ -13,8 +13,8 @@
__doc__='''SQL Methods
$Id: SQL.py,v 1.20 2001/11/28 15:51:10 matt Exp $'''
__version__='$Revision: 1.20 $'[11:-2]
$Id: SQL.py,v 1.21 2002/08/14 22:25:18 mj Exp $'''
__version__='$Revision: 1.21 $'[11:-2]
import Shared.DC.ZRDB.DA
from Globals import DTMLFile
......
......@@ -13,8 +13,8 @@
__doc__='''SQL Method Product
$Id: __init__.py,v 1.17 2001/11/28 15:51:10 matt Exp $'''
__version__='$Revision: 1.17 $'[11:-2]
$Id: __init__.py,v 1.18 2002/08/14 22:25:18 mj Exp $'''
__version__='$Revision: 1.18 $'[11:-2]
import Shared.DC.ZRDB.Search, Shared.DC.ZRDB.Aqueduct, SQL
import Shared.DC.ZRDB.RDB
import Shared.DC.ZRDB.sqlvar, Shared.DC.ZRDB.sqlgroup, Shared.DC.ZRDB.sqltest
......
......@@ -100,15 +100,3 @@ class ZSQLMethod:
the SQL Template.
"""
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