merge from svn+ssh://andreasjung@svn.zope.org/repos/main/Zope/z212-deprecation-cleanup

doc/CHANGES.txt

@@ -9,6 +9,12 @@ Zope Changes
 
     Restructuring
 
+      - Removed deprecated ZTUtil.Iterator module
+
+      - Removed deprecated StructuredText module
+
+      - Removed deprecated TAL module
+
       - Removed deprecated modules from Products.PageTemplates.
 
       - Removed deprecated ZCML directives from Five including the whole
@@ -465,7 +471,7 @@ Zope Changes
         the 'logging' module
 
       - PluginIndexes/TextIndex is deprecated. Use ZCTextIndex instead
-
+  
       - the 'StructuredText' module is deprecated. Use zope.structuredtext
         instead
 

lib/python/OFS/OrderSupport.py

@@ -261,16 +261,8 @@ class OrderSupport(object):
         old_position = self.getObjectPosition(id)
         result = super(OrderSupport, self).manage_renameObject(id, new_id,
                                                                REQUEST)
-        try:
-            self.moveObjectToPosition(new_id, old_position,
-                                      suppress_events=True)
-        except TypeError:
-            # BBB: removed in Zope 2.11
-            self.moveObjectToPosition(new_id, old_position)
-            warnings.warn(
-                "%s.moveObjectToPosition without suppress_events is "
-                "deprecated and will be removed in Zope 2.11." %
-                self.__class__.__name__, DeprecationWarning)
+        self.moveObjectToPosition(new_id, old_position,
+                                  suppress_events=True)
         return result
 
     def tpValues(self):

lib/python/Products/ZCatalog/ZCatalog.py

@@ -504,15 +504,6 @@ class ZCatalog(Folder, Persistent, Implicit):
                 '?manage_tabs_message=Reindexing%20Performed')
 
 
-    # BBB: will be removed in Zope 2.12 (like TextIndex itself)
-    security.declareProtected(manage_zcatalog_entries, 'availableSplitters')
-    def availableSplitters(self):
-        """ splitter we can add """
-        # This import will trigger a deprecation warning about TextIndex
-        from Products.PluginIndexes.TextIndex import Splitter
-        return Splitter.availableSplitters
-
-
     security.declareProtected(manage_zcatalog_entries, 'catalog_object')
     def catalog_object(self, obj, uid=None, idxs=None, update_metadata=1, pghandler=None):
         """ wrapper around catalog """

lib/python/Products/ZCatalog/__init__.py

@@ -14,7 +14,6 @@
 """ZCatalog product"""
 
 import ZCatalog, CatalogAwareness, CatalogPathAwareness
-from Products.PluginIndexes.TextIndex import Vocabulary
 
 # BBB: ZClasses are deprecated but we don't want the warning to appear here
 import warnings
@@ -44,13 +43,6 @@ def initialize(context):
         icon='www/ZCatalog.gif',
         )
 
-    context.registerClass(
-        Vocabulary.Vocabulary,
-        permission='Add Vocabularies',
-        constructors=(Vocabulary.manage_addVocabularyForm,
-                      Vocabulary.manage_addVocabulary),
-        icon='www/Vocabulary.gif',
-        )
 
     context.registerHelp()
     context.registerHelpTitle('Zope Help')

lib/python/StructuredText/DocBookClass.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext.docbook import DocBook as DocBookClass
-from zope.structuredtext.docbook import \
-     DocBookChapter, DocBookChapterWithFigures, DocBookArticle, DocBookBook
-
-from zope.deprecation import deprecated
-deprecated("DocBookClass",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.docbook.DocBook '
-           'instead.')
-deprecated("DocBookChapter",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.docbook.DocBookChapter '
-           'instead.')
-deprecated("DocBookChapterWithFigures",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.docbook.DocBookChapterWithFigures '
-           'instead.')
-deprecated("DocBookArticle",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.docbook.DocBookArticle '
-           'instead.')
-deprecated("DocBookBook",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.docbook.DocBookBook '
-           'instead.')

lib/python/StructuredText/DocumentClass.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext.document import Document as DocumentClass
-from zope.structuredtext.stng import (
-    StructuredTextExample, StructuredTextBullet, StructuredTextNumbered,
-    StructuredTextDescriptionTitle, StructuredTextDescriptionBody,
-    StructuredTextDescription, StructuredTextSectionTitle,
-    StructuredTextSection, StructuredTextTable, StructuredTextRow,
-    StructuredTextColumn, StructuredTextTableHeader,
-    StructuredTextTableData, StructuredTextMarkup, StructuredTextLiteral,
-    StructuredTextEmphasis, StructuredTextStrong, StructuredTextInnerLink,
-    StructuredTextNamedLink, StructuredTextUnderline, StructuredTextSGML,
-    StructuredTextLink, StructuredTextXref
-    )
-
-from zope.deprecation import deprecated
-deprecated("DocumentClass",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.document.Document '
-           'instead.')

lib/python/StructuredText/DocumentWithImages.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext.stng import StructuredTextImage
-from zope.structuredtext.document import DocumentWithImages
-
-from zope.deprecation import deprecated
-deprecated("StructuredTextImage",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.stng.StructuredTextImage '
-           'instead.')
-deprecated("DocumentWithImages",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.document.DocumentWithImages '
-           'instead.')

lib/python/StructuredText/HTMLClass.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext.html import HTML as HTMLClass
-from zope.deprecation import deprecated
-deprecated("HTMLClass",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.html.HTML instead.')

lib/python/StructuredText/HTMLWithImages.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext.html import HTMLWithImages
-from zope.deprecation import deprecated
-deprecated("HTMLWithImages",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.html.HTMLWithImages '
-           'instead.')

lib/python/StructuredText/ST.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext.stng import \
-     indention, insert, display, display2, findlevel
-from zope.structuredtext.stng import structurize as StructuredText
-from zope.structuredtext.stng import \
-     StructuredTextParagraph, StructuredTextDocument
-Basic = StructuredText
-
-from zope.deprecation import deprecated
-deprecated(("StructuredText", "Basic"),
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.stng.structurize '
-           'instead.')
-deprecated("StructuredTextParagraph",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.stng.StructuredTextParagraph '
-           'instead.')
-deprecated("StructuredTextDocument",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.stng.StructuredTextDocument '
-           'instead.')

lib/python/StructuredText/STNG.txt

-Using Structured Text
-
-  WARNING! The 'StructuredText' package has been deprecated and will
-  be removed in Zope 2.12.  Use 'zope.structuredtext' instead.
-
-  The goal of StructuredText is to make it possible to express
-  structured text using a relatively simple plain text format. Simple
-  structures, like bullets or headings are indicated through
-  conventions that are natural, for some definition of
-  "natural". Hierarchical structures are indicated through
-  indentation. The use of indentation to express hierarchical
-  structure is inspired by the Python programming language.
-
-  Use of StructuredText consists of one to three logical steps. In the
-  first step, a text string is converted to a network of objects using
-  the 'StructuredText.Basic' facility, as in the following
-  example::
-
-    raw=open("mydocument.txt").read()
-    import StructuredText
-    st=StructuredText.Basic(raw)
-
-  The output of 'StructuredText.Basic' is simply a
-  StructuredTextDocument object containing StructuredTextParagraph
-  objects arranged in a hierarchy. Paragraphs are delimited by strings
-  of two or more whitespace characters beginning and ending with
-  newline characters. Hierarchy is indicated by indentation. The
-  indentation of a paragraph is the minimum number of leading spaces
-  in a line containing non-white-space characters after converting tab
-  characters to spaces (assuming a tab stop every eight characters).
-
-  StructuredTextNode objects support the read-only subset of the
-  Document Object Model (DOM) API. It should be possible to process
-  'StructuredTextNode' hierarchies using XML tools such as XSLT.
-
-  The second step in using StructuredText is to apply additional
-  structuring rules based on text content. A variety of differentText
-  rules can be used. Typically, these are used to implement a
-  structured text language for producing documents, but any sort of
-  structured text language could be implemented in the second
-  step. For example, it is possible to use StructuredText to implement
-  structured text formats for representing structured data. The second
-  step, which could consist of multiple processing steps, is
-  performed by processing, or "coloring", the hierarchy of generic
-  StructuredTextParagraph objects into a network of more specialized
-  objects. Typically, the objects produced should also implement the DOM
-  API to allow processing with XML tools.
-
-  A document processor is provided to convert a StructuredTextDocument
-  object containing only StructuredStructuredTextParagraph objects
-  into a StructuredTextDocument object containing a richer collection
-  of objects such as bullets, headings, emphasis, and so on using
-  hints in the text. Hints are selected based on conventions of the
-  sort typically seen in electronic mail or news-group postings. It
-  should be noted, however, that these conventions are somewhat
-  culturally dependent, fortunately, the document processor is easily
-  customized to implement alternative rules. Here's an example of
-  using the DOC processor to convert the output of the previous example::
-
-    doc=StructuredText.Document(st)
-
-  The final step is to process the colored networks produced from the
-  second step to produce additional outputs. The final step could be
-  performed by Python programs, or by XML tools. A Python outputter is
-  provided for the document processor output that produces Hypertext Markup
-  Language (HTML) text::
-
-    html=StructuredText.HTML(doc)
-
-Customizing the document processor
-
-  The document processor is driven by two tables. The first table,
-  named 'paragraph_types', is a sequence of callable objects or method
-  names for coloring paragraphs. If a table entry is a string, then it
-  is the name of a method of the document processor to be used. For
-  each input paragraph, the objects in the table are called until one
-  returns a value (not 'None'). The value returned replaces the
-  original input paragraph in the output. If none of the objects in
-  the paragraph types table return a value, then a copy of the
-  original paragraph is used.  The new object returned by calling a
-  paragraph type should implement the ReadOnlyDOM,
-  StructuredTextColorizable, and StructuredTextSubparagraphContainer
-  interfaces. See the 'Document.py' source file for examples.
-
-  A paragraph type may return a list or tuple of replacement
-  paragraphs, this allowing a paragraph to be split into multiple
-  paragraphs. 
-
-  The second table, 'text_types', is a sequence of callable objects or
-  method names for coloring text. The callable objects in this table
-  are used in sequence to transform the input text into new text or
-  objects.  The callable objects are passed a string and return
-  nothing ('None') or a three-element tuple consisting of:
-
-    - a replacement object,
-
-    - a starting position, and
-
-    - an ending position
-
-  The text from the starting position is (logically) replaced with the
-  replacement object. The replacement object is typically an object
-  that implements that implements the ReadOnlyDOM, and
-  StructuredTextColorizable interfaces. The replacement object can
-  also be a string or a list of strings or objects. Replacement is
-  done from beginning to end and text after the replacement ending
-  position will be passed to the character type objects for processing.
-
-Example: adding wiki links
-
-  We want to add support for Wiki links. A Wiki link is a string of
-  text containing mixed-case letters, such that at least two of the
-  letters are upper case and such that the first letter is upper case.

lib/python/StructuredText/StructuredText.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-"""Alias module for StructuredTextClassic compatibility which makes
-use of StructuredTextNG"""
-import re
-from zope.structuredtext import stx2html as HTML
-from zope.structuredtext import stx2htmlWithReferences as html_with_references
-StructuredText = HTML
-
-from zope.deprecation import deprecated
-deprecated(("HTML, StructuredText"),
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.stx2html instead.')
-deprecated("html_with_references",
-           'The StructuredText package is deprecated and will be removed '
-           'in Zope 2.12. Use zope.structuredtext.stx2htmlWithReferences '
-           'instead.')
-
-def html_quote(v,
-               character_entities=(
-                       (re.compile('&'), '&'),
-                       (re.compile("<"), '&lt;' ),
-                       (re.compile(">"), '&gt;' ),
-                       (re.compile('"'), '&quot;')
-                       )): #"
-    text=str(v)
-    for re,name in character_entities:
-        text=re.sub(name,text)
-    return text
-
-if __name__=='__main__':
-    import getopt
-
-    opts,args = getopt.getopt(sys.argv[1:],'',[])
-
-    for k,v in opts:
-        pass
-
-
-    for f in args:
-        print HTML(open(f).read())

lib/python/StructuredText/__init__.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-from zope.structuredtext import html, document, docbook
-from zope.structuredtext.stng import structurize as Basic
-
-from StructuredText import html_quote
-from zope.structuredtext import stx2html as HTML
-from zope.structuredtext import stx2htmlWithReferences as html_with_references
-from types import StringType, UnicodeType
-
-# BBB -- 2006/01/08 -- Remove in Zope 2.12
-import sys
-import zope.structuredtext.stletters
-import zope.structuredtext.stdom
-sys.modules['StructuredText.STletters'] = zope.structuredtext.stletters
-sys.modules['StructuredText.STDOM'] = zope.structuredtext.stdom
-
-import ClassicDocumentClass
-Classic = ClassicDocumentClass.DocumentClass()
-Document = document.Document()
-DocumentWithImages = document.DocumentWithImages()
-HTMLWithImages = html.HTMLWithImages()
-ClassicHTML = html.HTML
-HTMLNG = html.HTML()
-
-DocBookBook = docbook.DocBookBook()
-DocBookChapter = docbook.DocBookChapter()
-DocBookChapterWithFigures = docbook.DocBookChapterWithFigures()
-DocBookArticle = docbook.DocBookArticle()
-
-def HTML(src, level=1):
-    import warnings
-    warnings.warn(
-        'The StructuredText package is deprecated and will be removed '
-        'in Zope 2.12. Use zope.structuredtext instead.',
-        DeprecationWarning, stacklevel=2)
-    if isinstance(src, basestring):
-        return ClassicHTML(src, level)
-    return HTMLNG(src, level)

lib/python/StructuredText/regressions/Acquisition.stx

-Acquisition
-
-  "Copyright (C) 1996-1998, Digital Creations":COPYRIGHT.html.
-
-  Acquisition [1] is a mechanism that allows objects to obtain
-  attributes from their environment.  It is similar to inheritence,
-  except that, rather than traversing an inheritence hierarchy
-  to obtain attributes, a containment hierarchy is traversed.
-
-  The "ExtensionClass":ExtensionClass.html. release includes mix-in
-  extension base classes that can be used to add acquisition as a
-  feature to extension subclasses.  These mix-in classes use the
-  context-wrapping feature of ExtensionClasses to implement
-  acquisition. Consider the following example::
-
-    import ExtensionClass, Acquisition
-
-    class C(ExtensionClass.Base):
-      color='red'
-
-    class A(Acquisition.Implicit):
-
-      def report(self):
-        print self.color
-
-    a=A()
-    c=C()
-    c.a=A()
-
-    c.a.report() # prints 'red'
-
-    d=C()
-    d.color='green'
-    d.a=a
-
-    d.a.report() # prints 'green'
-
-    a.report() # raises an attribute error
-
-  The class 'A' inherits acquisition behavior from
-  'Acquisition.Implicit'.  The object, 'a', "has" the color of
-  objects 'c' and 'd' when it is accessed through them, but it
-  has no color by itself.  The object 'a' obtains attributes
-  from it's environment, where it's environment is defined by
-  the access path used to reach 'a'.
-
-  Acquisition wrappers
-
-    When an object that supports acquisition is accessed through
-    an extension class instance, a special object, called an
-    acquisition wrapper, is returned.  In the example above, the
-    expression 'c.a' returns an acquisition wrapper that
-    contains references to both 'c' and 'a'.  It is this wrapper
-    that performs attribute lookup in 'c' when an attribute
-    cannot be found in 'a'.
-
-    Aquisition wrappers provide access to the wrapped objects
-    through the attributes 'aq_parent', 'aq_self', 'aq_base'.  
-    In the example above, the expressions::
-      
-       'c.a.aq_parent is c'
-
-    and::
-
-       'c.a.aq_self is a'
-
-    both evaluate to true, but the expression::
-
-       'c.a is a'
-
-    evaluates to false, because the expression 'c.a' evaluates
-    to an acquisition wrapper around 'c' and 'a', not 'a' itself.
-
-    The attribute 'aq_base' is similar to 'aq_self'.  Wrappers may be
-    nested and 'aq_self' may be a wrapped object.  The 'aq_base'
-    attribute is the underlying object with all wrappers removed.
-
-  Acquisition Control
-
-    Two styles of acquisition are supported in the current
-    ExtensionClass release, implicit and explicit aquisition.
-  
-    Implicit acquisition
-    
-      Implicit acquisition is so named because it searches for
-      attributes from the environment automatically whenever an
-      attribute cannot be obtained directly from an object or
-      through inheritence.
-  
-      An attribute may be implicitly acquired if it's name does
-      not begin with an underscore, '_'.
-  
-      To support implicit acquisition, an object should inherit
-      from the mix-in class 'Acquisition.Implicit'.
-  
-    Explicit Acquisition
-  
-      When explicit acquisition is used, attributes are not
-      automatically obtained from the environment.  Instead, the
-      method 'aq_aquire' must be used, as in::
-  
-	print c.a.aq_acquire('color')
-  
-      To support explicit acquisition, an object should inherit
-      from the mix-in class 'Acquisition.Explicit'.
-
-    Controlled Acquisition
-
-      A class (or instance) can provide attribute by attribute control
-      over acquisition.  This is done by:
-
-      - subclassing from 'Acquisition.Explicit', and
-
-      - setting all attributes that should be acquired to the special
-        value: 'Acquisition.Acquired'.  Setting an attribute to this
-        value also allows inherited attributes to be overridden with
-        acquired ones.
-
-	For example, in::
-
-	  class C(Acquisition.Explicit):
-	     id=1
-	     secret=2
-	     color=Acquisition.Acquired
-	     __roles__=Acquisition.Acquired
-
-	The *only* attributes that are automatically acquired from
-	containing objects are 'color', and '__roles__'.  Note also
-	that the '__roles__' attribute is acquired even though it's
-	name begins with an underscore.  In fact, the special
-	'Acquisition.Acquired' value can be used in
-	'Acquisition.Implicit' objects to implicitly acquire selected
-	objects that smell like private objects.
-
-    Filtered Acquisition
-
-      The acquisition method, 'aq_acquire', accepts two optional
-      arguments. The first of the additional arguments is a
-      "filtering" function that is used when considering whether to
-      acquire an object.  The second of the additional arguments is an
-      object that is passed as extra data when calling the filtering
-      function and which defaults to 'None'.
-
-      The filter function is called with five arguments:
-
-      - The object that the 'aq_acquire' method was called on,
-
-      - The object where an object was found,
-
-      - The name of the object, as passed to 'aq_acquire',
-
-      - The object found, and
-
-      - The extra data passed to 'aq_acquire'.
-
-      If the filter returns a true object that the object found is
-      returned, otherwise, the acquisition search continues.
-
-      For example, in::
-
-	from Acquisition import Explicit
-	
-	class HandyForTesting:
-	    def __init__(self, name): self.name=name
-	    def __str__(self):
-		return "%s(%s)" % (self.name, self.__class__.__name__)
-	    __repr__=__str__
-	
-	class E(Explicit, HandyForTesting): pass
-	
-	class Nice(HandyForTesting):
-	    isNice=1
-	    def __str__(self):
-		return HandyForTesting.__str__(self)+' and I am nice!'
-	    __repr__=__str__
-	
-	a=E('a')
-	a.b=E('b')
-	a.b.c=E('c')
-	a.p=Nice('spam')
-	a.b.p=E('p')
-	
-	def find_nice(self, ancestor, name, object, extra):
-	    return hasattr(object,'isNice') and object.isNice
-	
-	print a.b.c.aq_acquire('p', find_nice)
-
-      The filtered acquisition in the last line skips over the first
-      attribute it finds with the name 'p', because the attribute
-      doesn't satisfy the condition given in the filter. The output of
-      the last line is::
-
-        spam(Nice) and I am nice!
-
-  Acquisition and methods
-
-    Python methods of objects that support acquisition can use
-    acquired attributes as in the 'report' method of the first example
-    above.  When a Python method is called on an object that is
-    wrapped by an acquisition wrapper, the wrapper is passed to the
-    method as the first argument.  This rule also applies to
-    user-defined method types and to C methods defined in pure mix-in
-    classes.
-
-    Unfortunately, C methods defined in extension base classes that
-    define their own data structures, cannot use aquired attributes at
-    this time.  This is because wrapper objects do not conform to the
-    data structures expected by these methods.
-
-  Acquiring Acquiring objects
-
-    Consider the following example::
-
-      from Acquisition import Implicit
-      
-      class C(Implicit):
-	  def __init__(self, name): self.name=name
-	  def __str__(self):
-	      return "%s(%s)" % (self.name, self.__class__.__name__)
-	  __repr__=__str__
-      
-      a=C("a")
-      a.b=C("b")
-      a.b.pref="spam"
-      a.b.c=C("c")
-      a.b.c.color="red"
-      a.b.c.pref="eggs"
-      a.x=C("x")
-
-      o=a.b.c.x
-
-    The expression 'o.color' might be expected to return '"red"'. In
-    earlier versions of ExtensionClass, however, this expression
-    failed.  Acquired acquiring objects did not acquire from the
-    environment they were accessed in, because objects were only
-    wrapped when they were first found, and were not rewrapped as they
-    were passed down the acquisition tree.
-
-    In the current release of ExtensionClass, the expression "o.color"
-    does indeed return '"red"'.
-
-    When searching for an attribute in 'o', objects are searched in
-    the order 'x', 'a', 'b', 'c'. So, for example, the expression,
-    'o.pref' returns '"spam"', not '"eggs"'.  In earlier releases of
-    ExtensionClass, the attempt to get the 'pref' attribute from 'o'
-    would have failed.
-
-    If desired, the current rules for looking up attributes in complex
-    expressions can best be understood through repeated application of
-    the '__of__' method:
-
-    'a.x' -- 'x.__of__(a)'
-
-    'a.b' -- 'b.__of__(a)'
-
-    'a.b.x' -- 'x.__of__(a).__of__(b.__of__(a))'
-
-    'a.b.c' -- 'c.__of__(b.__of__(a))'
-
-    'a.b.c.x' --
-        'x.__of__(a).__of__(b.__of__(a)).__of__(c.__of__(b.__of__(a)))'
-
-    and by keeping in mind that attribute lookup in a wrapper
-    is done by trying to lookup the attribute in the wrapped object
-    first and then in the parent object.  In the expressions above
-    involving the '__of__' method, lookup proceeds from left to right.
-
-    Note that heuristics are used to avoid most of the repeated
-    lookups. For example, in the expression: 'a.b.c.x.foo', the object
-    'a' is searched no more than once, even though it is wrapped three
-    times.
-
-.. [1] Gil, J., Lorenz, D., 
-   "Environmental Acquisition--A New Inheritance-Like Abstraction Mechanism",
-   http://www.bell-labs.com/people/cope/oopsla/Oopsla96TechnicalProgramAbstracts.html#GilLorenz, 
-   OOPSLA '96 Proceedings, ACM SIG-PLAN, October, 1996
-	 

lib/python/StructuredText/regressions/InnerLinks.ref

-<html>
-<head>
-<title>This is the InnerLinkTest</title>
-</head>
-<body>
-<h1>This is the InnerLinkTest</h1>
-<p>  see also <a href="#ref1">[1]</a> and <a href="#ref2">[2]</a></p>
-<p>  <a name="ref1">[1]</a> "Zope Book" by Amos Lattmeier and Michel Pelletier</p>
-<p>  <a name="ref2">[2]</a> "Python Book" by Guido van Rossum</p>
-</body>
-</html>

lib/python/StructuredText/regressions/InnerLinks.stx

-This is the InnerLinkTest
-
-
-  see also [1] and [2]
-
-
-  .. [1] "Zope Book" by Amos Lattmeier and Michel Pelletier
-
-  .. [2] "Python Book" by Guido van Rossum
-  

lib/python/StructuredText/regressions/Links.ref

-<html>
-<head>
-<title>This is LinkTest</title>
-</head>
-<body>
-<h1>This is LinkTest</h1>
-
-<ul>
-<li>please click <a href="/Members/Zope">here</a></li>
-<li>please click <a href="/Members/Zope?a=b&c=d%20blabla">here</a></li>
-<li>please click <a href="http://www.zope.org">here</a></li>
-<li>please click <a href="http://www.zope.org/members/">here</a></li>
-<li>please click <a href="http://www.zope.org:2001">here</a> </li>
-<li>please click <a href="http://www.zope.org:2001/members/">here</a></li>
-<li>please click <a href="http://www.zope.org:2001/%20/Members/zope?a=222&b=213&_xc=just%20a%20test">here</a> </li>
-<li>please click <a href="http://www.zope.org:2001/%20/Members/zope?a=222&b=213&_xc=just%20a%20test">here</a> </li>
-<li>please click <a href="http://www.zope.org:2001/%20/Members/zope?a=222&b=213&_xc=just%20a%20test">here</a> </li>
-
-</ul>
-<p>  And now a paragraph with <a href="http://www.zope-rocks.org">Link 1</a> and 
-  <a href="http://www.zope-is-kewl.com">Link 2</a>  and <a href="http://www.freshmeat.net">one more link - yeah.</a></p>
-</body>
-</html>

lib/python/StructuredText/regressions/Links.stx

-This is LinkTest
-
-  - please click "here":/Members/Zope
-
-  - please click "here":/Members/Zope?a=b&c=d%20blabla
-
-  - please click "here":http://www.zope.org
-
-  - please click "here":http://www.zope.org/members/
-
-  - please click "here":http://www.zope.org:2001 
- 
-  - please click "here":http://www.zope.org:2001/members/
-
-  - please click "here":http://www.zope.org:2001/%20/Members/zope?a=222&b=213&_xc=just%20a%20test 
-
-  - please click "here":http://www.zope.org:2001/%20/Members/zope?a=222&b=213&_xc=just%20a%20test 
-
-  - please click "here", http://www.zope.org:2001/%20/Members/zope?a=222&b=213&_xc=just%20a%20test 
-
-
-  And now a paragraph with "Link 1":http://www.zope-rocks.org and 
-  "Link 2":http://www.zope-is-kewl.com  and "one more link - yeah.":http://www.freshmeat.net
-

lib/python/StructuredText/regressions/create_referencesfiles.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-
-
-import os,sys
-from StructuredText.StructuredText import HTML
-
-
-if len(sys.argv)>1:
-    files = sys.argv[1:]
-else:
-    files = os.listdir('.')
-    files = filter(lambda x: x.endswith('.stx'), files)
-
-
-for f in files:
-
-    data = open(f,'r').read()
-    html = HTML(data)
-
-    outfile = f.replace('.stx','.ref')
-    open(outfile,'w').write(html)

lib/python/StructuredText/regressions/examples.ref

-<html>
-<head>
-<title>Small Trials for Structured Text Formatting</title>
-</head>
-<body>
-<h1>Small Trials for Structured Text Formatting</h1>
-<p>  This paragraph should be preceded by a level 1 header.  It should
-  not, itself, be made into a header, just a regular paragraph.</p>
-<p>  Here are a few presentation styles, in a list <a href="#ref1">[1]</a>:</p>
-
-<ul>
-<li>A word: <em>emphasized</em>.</li>
-<li>A word: <u>underlined</u>.</li>
-<li>A word <strong>strong</strong>.</li>
-<li>An inline example: <code>1+2</code>.</li>
-<li>Another example with a different format:
-    ``x='spam''' or ``y='spam''' or ``<dtml-var spam>'<code>.</code><p>    We can use expressions in the DTML var tag as 
-    in ``<dtml-var "x+'.txt'">''</p>
-</li>
-<li>A mult-line example:
-<pre>
-     blah
-
-     *foo bar*
-
-     &lt;dtml-var yeha&gt;
-</pre>
-</li>
-
-</ul>
-<p><a name="ref1">[1]</a> (The referring text should be a paragraph, not a header, and
-should contain a reference to this footnote, footnote "<a href="#ref1">[1]</a>".)<p>  Some hrefs, in a definition list:</p>
-<dl>
-<dt>  <u>Regular</u></dt>
-<dd><a href="http://www.zope.org">http://www.zope.org/</a></dd>
-<dt>  <u>W/trailing punctuation</u></dt>
-<dd><a href="http://www.zope.org">http://www.zope.org/</a>.</dd>
-<dt>  <u>W protocol implicit</u></dt>
-<dd><a href=":locallink">locallink</a></dd>
-<dt>  <u>W protocol implicit</u>, alternate</dt>
-<dd>"locallink", :locallink</dd>
-</dl>
-<p>  |||| A Simple Two-column Table ||
-  || Column A || Column B ||
-  || Apples   || Oranges  ||</p>
-</p>
-</body>
-</html>

lib/python/StructuredText/regressions/examples.stx

-Small Trials for Structured Text Formatting
-
-  This paragraph should be preceded by a level 1 header.  It should
-  not, itself, be made into a header, just a regular paragraph.
-
-  Here are a few presentation styles, in a list [1]:
-
-  - A word: *emphasized*.
-
-  - A word: _underlined_.
-
-  - A word **strong**.
- 
-  - An inline example: '1+2'.
-
-  - Another example with a different format:
-    ``x='spam''' or ``y='spam''' or ``<dtml-var spam>''.'
-
-    We can use expressions in the DTML var tag as 
-    in ``<dtml-var "x+'.txt'">''
-
-  - A mult-line example::
-
-     blah
-
-     *foo bar*
-
-     <dtml-var yeha>
-
-
-.. [1] (The referring text should be a paragraph, not a header, and
-should contain a reference to this footnote, footnote "[1]".)
-
-  Some hrefs, in a definition list:
-
-  _Regular_ -- "http://www.zope.org/":http://www.zope.org
-
-  _W/trailing punctuation_ -- "http://www.zope.org/":http://www.zope.org.
-
-  _W protocol implicit_ -- "locallink"::locallink
-
-  _W protocol implicit_, alternate -- "locallink", :locallink
-
-  |||| A Simple Two-column Table ||
-  || Column A || Column B ||
-  || Apples   || Oranges  ||
-

lib/python/StructuredText/regressions/examples1.ref

-<html>
-<head>
-<title>Test</title>
-</head>
-<body>
-<h1>Test</h1>
-<p>  For instance:
-<pre>
-    &lt;table border="0"&gt;
-      &lt;tr&gt;&lt;td&gt;blabla&lt;/td&gt;&lt;/tr&gt;
-    &lt;/table&gt;
-</pre>
-</p>
-</body>
-</html>

lib/python/StructuredText/regressions/examples1.stx

-Test
- 
-  For instance::
-    
-    <table border="0">
-      <tr><td>blabla</td></tr>
-    </table>
-
-

lib/python/StructuredText/regressions/index.ref

-<html>
-<head>
-<title>Extension Class</title>
-</head>
-<body>
-<h1>Extension Class</h1>
-<p>    <a href="COPYRIGHT.html">Copyright (C) 1996-1998, Digital Creations</a>.</p>
-<p>    A lightweight mechanism has been developed for making Python
-    extension types more class-like.  Classes can be developed in an
-    extension language, such as C or C++, and these classes can be
-    treated like other python classes:</p>
-
-<ul>
-<li>They can be sub-classed in python,</li>
-<li>They provide access to method documentation strings, and</li>
-<li>They can be used to directly create new instances.</li>
-
-</ul>
-<p>    Extension classes provide additional extensions to class and
-    instance semantics, including:</p>
-
-<ul>
-<li>A protocol for accessing subobjects "in the context of" their
-      containers.  This is used to implement custom method types
-      and <a href="Acquisition.html">environmental acquisition</a>.</li>
-<li>A protocol for overriding method call semantics.  This is used
-      to implement "synchonized" classes and could be used to
-      implement argument type checking.</li>
-<li>A protocol for class initialization that supports execution of a
-      special <code>__class_init__</code> method after a class has been
-      initialized. </li>
-
-</ul>
-<p>    Extension classes illustrate how the Python class mechanism can be
-    extended and may provide a basis for improved or specialized class
-    models. </p>
-<h2>  Releases</h2>
-<p>    The current release is <a href="ExtensionClass-1.2.tar.gz">1.2</a>,
-    To find out what's changed in this release,
-    see the <a href="release.html">release notes</a>.</p>
-<p>    Documentation is available <a href="ExtensionClass.html">on-line</a>.</p>
-<h3>  Windows Binaries</h3>
-<p>    A win32 binary release, <a href="ec12.zip">ec12.zip</a>, is available.  This
-    release includes all of the ExtensionClass modules built as 
-    Windows extension modules (.pyd) files.  These were built for
-    Python 1.5.1 using Microsoft Visual C++ 5.0 in "Release" mode.</p>
-</body>
-</html>

lib/python/StructuredText/regressions/index.stx

-
-Extension Class
-  
-    "Copyright (C) 1996-1998, Digital Creations":COPYRIGHT.html.
-
-    A lightweight mechanism has been developed for making Python
-    extension types more class-like.  Classes can be developed in an
-    extension language, such as C or C++, and these classes can be
-    treated like other python classes:
-  
-    - They can be sub-classed in python,
-  
-    - They provide access to method documentation strings, and
-  
-    - They can be used to directly create new instances.
-  
-    Extension classes provide additional extensions to class and
-    instance semantics, including:
-
-    - A protocol for accessing subobjects "in the context of" their
-      containers.  This is used to implement custom method types
-      and "environmental acquisition":Acquisition.html.
-
-    - A protocol for overriding method call semantics.  This is used
-      to implement "synchonized" classes and could be used to
-      implement argument type checking.
-
-    - A protocol for class initialization that supports execution of a
-      special '__class_init__' method after a class has been
-      initialized. 
-  
-    Extension classes illustrate how the Python class mechanism can be
-    extended and may provide a basis for improved or specialized class
-    models. 
-
-  Releases
-
-    The current release is "1.2":ExtensionClass-1.2.tar.gz,
-    To find out what's changed in this release,
-    see the "release notes":release.html.
-
-    Documentation is available "on-line":ExtensionClass.html.
-
-  Windows Binaries
-
-    A win32 binary release, "ec12.zip":ec12.zip, is available.  This
-    release includes all of the ExtensionClass modules built as 
-    Windows extension modules (.pyd) files.  These were built for
-    Python 1.5.1 using Microsoft Visual C++ 5.0 in "Release" mode.
-
-    
-

lib/python/StructuredText/regressions/table.ref

-<html>
-<body>
-<table border="1" cellpadding="2">
-<tr>
-<th colspan="1" align="left" valign="middle"><p> Function  </p>
-</th>
-<th colspan="1" align="left" valign="middle"><p>  Documentation                       </p>
-</th>
-</tr>
-<tr>
-<td colspan="1" align="left" valign="top"><p> <code>__str__</code> </p>
-</td>
-<td colspan="1" align="left" valign="middle"><p>  This method converts the            
-   the object to a string.            </p>
-
-<ul>
-<li>Blah                              </li>
-<li>Blaf                              <table border="1" cellpadding="2">
-<tr>
-<th colspan="1" align="center" valign="top"><p>  Name   </p>
-</th>
-<th colspan="1" align="left" valign="middle"><p>  Favorite       
-  Color          </p>
-</th>
-</tr>
-<tr>
-<td colspan="1" align="left" valign="middle"><p> Jim     </p>
-</td>
-<td colspan="1" align="center" valign="middle"><p>   Red           </p>
-</td>
-</tr>
-<tr>
-<td colspan="1" align="left" valign="middle"><p> John    </p>
-</td>
-<td colspan="1" align="center" valign="middle"><p>   Blue          </p>
-</td>
-</tr>
-</table>
-</li>
-
-</ul>
-</td>
-</tr>
-</table>
-<table border="1" cellpadding="2">
-<tr>
-<td colspan="3" align="left" valign="middle"><p> This should give a row with colspan 3 </p>
-</td>
-</tr>
-<tr>
-<td colspan="1" align="left" valign="middle"><p> Col 1  </p>
-</td>
-<td colspan="1" align="center" valign="middle"><p>       Col 2  </p>
-</td>
-<td colspan="1" align="center" valign="middle"><p>        Col 3    </p>
-</td>
-</tr>
-<tr>
-<td colspan="1" align="left" valign="middle"><p> Col 1  </p>
-</td>
-<td colspan="2" align="center" valign="middle"><p>       Col 2                   </p>
-</td>
-</tr>
-<tr>
-<td colspan="2" align="left" valign="middle"><p> Col 1                </p>
-</td>
-<td colspan="1" align="center" valign="middle"><p>        Col 2    </p>
-</td>
-</tr>
-</table>
-</body>
-</html>

lib/python/StructuredText/regressions/table.stx

-|-------------------------------------------------|
-| Function  | Documentation                       |
-|=================================================|
-| '__str__' | This method converts the            |
-|           |  the object to a string.            |
-|           |                                     |
-|           | - Blah                              |
-|           |                                     |
-|           | - Blaf                              |
-|           |                                     |
-|           |       |--------------------------|  |
-|           |       |  Name   | Favorite       |  |
-|           |       |         | Color          |  |
-|           |       |==========================|  |
-|           |       | Jim     |  Red           |  |
-|           |       |--------------------------|  |
-|           |       | John    |  Blue          |  |
-|           |       |--------------------------|  |
-|-------------------------------------------------|
-
-
-
-|---------------------------------------|
-| This should give a row with colspan 3 |
-|---------------------------------------|
-| Col 1  |      Col 2  |       Col 3    |
-|---------------------------------------|
-| Col 1  |      Col 2                   |
-|---------------------------------------|
-| Col 1                |       Col 2    |
-|---------------------------------------|
-

lib/python/StructuredText/tests/__init__.py

-##############################################################################
-#
-# Copyright (c) 2003 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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.
-#
-##############################################################################
-
-# This file is needed to make this a package.

lib/python/StructuredText/ts_regex.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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
-#
-##############################################################################
-"""Provide a thread-safe interface to regex
-"""
-import regex, regsub #, Sync
-from regex import *
-from regsub import split, sub, gsub, splitx, capwords
-
-try:
-    import thread
-except:
-    class allocate_lock:
-        def acquire(*args): pass
-        def release(*args): pass
-
-else:
-    class SafeFunction:
-        _l=thread.allocate_lock()
-        _a=_l.acquire
-        _r=_l.release
-
-        def __init__(self, f):
-            self._f=f
-
-        def __call__(self, *args, **kw):
-            self._a()
-            try: return self._f(*args, **kw)
-            finally: self._r()
-
-    split=SafeFunction(split)
-    sub=SafeFunction(sub)
-    gsub=SafeFunction(gsub)
-    splitx=SafeFunction(splitx)
-    capwords=SafeFunction(capwords)
-
-    allocate_lock=thread.allocate_lock
-
-class compile:
-
-    _r=None
-    groupindex=None
-
-    def __init__(self, *args):
-        self._r=r=regex(*compile, **args)
-        self._init(r)
-
-    def _init(self, r):
-        lock=allocate_lock()
-        self.__a=lock.acquire
-        self.__r=lock.release
-        self.translate=r.translate
-        self.givenpat=r.givenpat
-        self.realpat=r.realpat
-
-    def match(self, string, pos=0):
-        self.__a()
-        try: return self._r.match(string, pos)
-        finally: self.__r()
-
-    def search(self, string, pos=0):
-        self.__a()
-        try: return self._r.search(string, pos)
-        finally: self.__r()
-
-    def search_group(self, str, group, pos=0):
-        """Search a string for a pattern.
-
-        If the pattern was not found, then None is returned,
-        otherwise, the location where the pattern was found,
-        as well as any specified group are returned.
-        """
-        self.__a()
-        try:
-            r=self._r
-            l=r.search(str, pos)
-            if l < 0: return None
-            return l, r.group(*group)
-        finally: self.__r()
-
-    def match_group(self, str, group, pos=0):
-        """Match a pattern against a string
-
-        If the string does not match the pattern, then None is
-        returned, otherwise, the length of the match, as well
-        as any specified group are returned.
-        """
-        self.__a()
-        try:
-            r=self._r
-            l=r.match(str, pos)
-            if l < 0: return None
-            return l, r.group(*group)
-        finally: self.__r()
-
-    def search_regs(self, str, pos=0):
-        """Search a string for a pattern.
-
-        If the pattern was not found, then None is returned,
-        otherwise, the 'regs' attribute of the expression is
-        returned.
-        """
-        self.__a()
-        try:
-            r=self._r
-            r.search(str, pos)
-            return r.regs
-        finally: self.__r()
-
-    def match_regs(self, str, pos=0):
-        """Match a pattern against a string
-
-        If the string does not match the pattern, then None is
-        returned, otherwise, the 'regs' attribute of the expression is
-        returned.
-        """
-        self.__a()
-        try:
-            r=self._r
-            r.match(str, pos)
-            return r.regs
-        finally: self.__r()
-
-class symcomp(compile):
-
-    def __init__(self, *args):
-        self._r=r=regex.symcomp(*args)
-        self._init(r)
-        self.groupindex=r.groupindex

lib/python/TAL/CHANGES.txt

-TAL changes
-
-  This file contains change information for the current release. 
-  Change information for previous versions can be found in the
-  file HISTORY.txt.
-
-    Version 1.5.0
-
-      Features Added
-
-        - Line and column numbers are added to more exceptions.

lib/python/TAL/DummyEngine.py

-##############################################################################
-#
-# 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.1 (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.
-#
-##############################################################################
-"""
-Dummy TALES engine so that I can test out the TAL implementation.
-
-BBB 2005/05/01 -- to be removed after 12 months
-"""
-import zope.deprecation
-zope.deprecation.moved('zope.tal.dummyengine', '2.12')
-
-from zope.tal.dummyengine import DummyTranslationDomain as DummyDomain
-
-class DummyTranslationService:
-
-    def translate(self, domain, msgid, mapping=None, context=None,
-                  target_language=None, default=None):
-        return self.getDomain(domain).translate(msgid, mapping, context,
-                                                target_language,
-                                                default=default)
-
-    def getDomain(self, domain):
-        return DummyDomain()

lib/python/TAL/HTMLTALParser.py

-##############################################################################
-#
-# 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.1 (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.
-#
-##############################################################################
-"""
-Parse HTML and compile to TALInterpreter intermediate code.
-
-BBB 2005/05/01 -- to be removed after 12 months
-"""
-import zope.deprecation
-zope.deprecation.moved('zope.tal.htmltalparser', '2.12')

lib/python/TAL/ITALES.py

-"""Interface that a TALES engine provides to the METAL/TAL implementation."""
-
-import zope.deferredimport
-zope.deferredimport.deprecatedFrom(
-    "The TAL implementation has moved to zope.tal.  Import expression "
-    "interfaces from zope.tal.interfaces.  The old references will be "
-    "gone in Zope 2.12.",
-    'zope.tal.interfaces'
-    'ITALExpressionCompiler', 'ITALExpressionEngine', 'ITALExpressionErrorInfo'
-    )
-

lib/python/TAL/TALDefs.py

-##############################################################################
-#
-# 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.1 (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.
-#
-##############################################################################
-"""
-Common definitions used by TAL and METAL compilation an transformation.
-
-BBB 2005/05/01 -- to be removed after 12 months
-"""
-import zope.deprecation
-zope.deprecation.moved('zope.tal.taldefs', '2.12')
-
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "TALESError has been renamed TALExpressionError and should be "
-    "imported from zope.tal.taldefs.  This reference will be gone in "
-    "Zope 2.12.",
-    TALESError = 'zope.tal.taldefs.TALExpressionError'
-    )

lib/python/TAL/benchmark/dtml01.html

-baseline

lib/python/TAL/benchmark/dtml04.html

-<dtml-in r8>
-  <td bgcolor="white">&dtml-x0;</td>
-  <td bgcolor="white">&dtml-x1;</td>
-  <td bgcolor="white">&dtml-x2;</td>
-  <td bgcolor="white">&dtml-x3;</td>
-</dtml-in>

lib/python/TAL/benchmark/tal01.html

-baseline