[Zope-Checkins] CVS: Zope/lib/python/StructuredText/regressions - Acquisition.ref:1.8 ExtensionClass.ref:1.8 InnerLinks.ref:1.2 examples.ref:1.7 table.ref:1.4 table.stx:1.2
Andreas Jung
andreas@zope.com
Wed, 21 Nov 2001 08:53:55 -0500
Update of /cvs-repository/Zope/lib/python/StructuredText/regressions
In directory cvs.zope.org:/tmp/cvs-serv27982/regressions
Modified Files:
Acquisition.ref ExtensionClass.ref InnerLinks.ref examples.ref
table.ref table.stx
Log Message:
updated regression tests due to changes in the HTML generation
=== Zope/lib/python/StructuredText/regressions/Acquisition.ref 1.7 => 1.8 ===
<h1>Acquisition</h1>
<p> <a href="COPYRIGHT.html">Copyright (C) 1996-1998, Digital Creations</a>.</p>
-<p> Acquisition <a href="#1">[1]</a> is a mechanism that allows objects to obtain
+<p> Acquisition <a href="#ref1">[1]</a> 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.</p>
@@ -253,7 +253,7 @@
lookups. For example, in the expression: <code>a.b.c.x.foo</code>, the object
<code>a</code> is searched no more than once, even though it is wrapped three
times.</p>
-<p><a name="1">[1]</a> Gil, J., Lorenz, D.,
+<p><a name="ref1">[1]</a> Gil, J., Lorenz, D.,
<a href="http://www.bell-labs.com/people/cope/oopsla/Oopsla96TechnicalProgramAbstracts.html#GilLorenz">Environmental Acquisition--A New Inheritance-Like Abstraction Mechanism</a>,
OOPSLA '96 Proceedings, ACM SIG-PLAN, October, 1996</p>
</body>
=== Zope/lib/python/StructuredText/regressions/ExtensionClass.ref 1.7 => 1.8 ===
slightly different than the usual class and instance semantics,
yet we don't want to do most of our development in C. For
- example, we have developed a persistence mechanism <a href="#1">[1]</a> that
+ example, we have developed a persistence mechanism <a href="#ref1">[1]</a> that
redefines <code>__getattr__</code> and <code>__setattr__</code> to take storage-related
actions when object state is accessed or modified. We want to be
able to take certain actions on <em>every</em> attribute reference, but
@@ -91,7 +91,7 @@
instance in a method object <em>if and only if</em> the attribute value is a
python function. For some applications, we might also want to be
able to bind extension functions, or other types of callable
- objects, such as HTML document templates <a href="#2">[2]</a>. Furthermore,
+ objects, such as HTML document templates <a href="#ref2">[2]</a>. Furthermore,
we might want to have greater control over how objects are bound.
For example, we might want to bind instances and callable objects
with special method objects that assure that no more than one thread
@@ -99,7 +99,7 @@
<p> We can provide these special semantics in extension types, but we
wish to provide them for classes developed in Python.</p>
<h2> Background</h2>
-<p> At the first Python Workshop, Don Beaudry presented work <a href="#3">[3]</a> done
+<p> At the first Python Workshop, Don Beaudry presented work <a href="#ref3">[3]</a> done
at V.I. Corp to integrate Python with C++ frameworks. This system
provided a number of important features, including:</p>
@@ -117,16 +117,16 @@
</ul>
<p> This work was not released, initially.</p>
<p> Shortly after the workshop, changes were made to Python to support
- the sub-classing features described in <a href="#3">[3]</a>. These changes were not
- documented until the fourth Python Workshop <a href="#4">[4]</a>.</p>
+ the sub-classing features described in <a href="#ref3">[3]</a>. These changes were not
+ documented until the fourth Python Workshop <a href="#ref4">[4]</a>.</p>
<p> At the third Python workshop, I presented some work I had done on
generating module documentation for extension types. Based on the
- discussion at this workshop, I developed a meta-type proposal <a href="#5">[5]</a>.
+ discussion at this workshop, I developed a meta-type proposal <a href="#ref5">[5]</a>.
This meta-type proposal was for an object that simply stored
meta-information for a type, for the purpose of generating module
documentation.</p>
<p> In the summer of 1996, Don Beaudry released the system described in
- <a href="#3">[3]</a> under the name MESS <a href="#6">[6]</a>. MESS addresses a number of needs but
+ <a href="#ref3">[3]</a> under the name MESS <a href="#ref6">[6]</a>. MESS addresses a number of needs but
has a few drawbacks:</p>
<ul>
@@ -148,9 +148,9 @@
</ul>
<p> As MESS matures, we expect most of these problems to be addressed.</p>
<h2> Extension Classes</h2>
-<p> To meet short term needs for a C-based persistence mechanism <a href="#1">[1]</a>, an
+<p> To meet short term needs for a C-based persistence mechanism <a href="#ref1">[1]</a>, an
extension class module was developed using the mechanism described
- in <a href="#4">[4]</a> and building on ideas from MESS <a href="#6">[6]</a>. The extension class module
+ in <a href="#ref4">[4]</a> and building on ideas from MESS <a href="#ref6">[6]</a>. The extension class module
recasts extension types as "extension classes" by seeking to
eliminate, or at least reduce semantic differences between types and
classes. The module was designed to meet the following goal:</p>
@@ -508,7 +508,7 @@
and that deserve mention.</p>
<ul>
-<li><p>In Python 1.4, the class extension mechanism described in <a href="#4">[4]</a> required
+<li><p>In Python 1.4, the class extension mechanism described in <a href="#ref4">[4]</a> required
that the first superclass in a list of super-classes must be of the
extended class type. This may not be convenient if mix-in
behavior is desired. If a list of base classes starts with a
@@ -573,7 +573,7 @@
<h2> Applications</h2>
<p> Aside from test and demonstration applications, the extension class
mechanism has been used to provide an extension-based implementation
- of the persistence mechanism described in <a href="#1">[1]</a>. We have developed
+ of the persistence mechanism described in <a href="#ref1">[1]</a>. We have developed
this further to provide features such as automatic deactivation of
objects not used after some period of time and to provide more
efficient persistent-object cache management.</p>
@@ -593,22 +593,22 @@
</p>
<p> In addition, the extension class module provides a relatively
concise example of the use of mechanisms that were added to Python
- to support MESS <a href="#6">[6]</a>, and that were described at the fourth Python
- Workshop <a href="#4">[4]</a>. It is hoped that this will spur research in improved
+ to support MESS <a href="#ref6">[6]</a>, and that were described at the fourth Python
+ Workshop <a href="#ref4">[4]</a>. It is hoped that this will spur research in improved
and specialized models for class implementation in Python.</p>
<p> References</p>
-<p><a name="1">[1]</a> Fulton, J., <a href="http://www.digicool.com/papers/Persistence.html">Providing Persistence for World-Wide-Web Applications</a>,
+<p><a name="ref1">[1]</a> Fulton, J., <a href="http://www.digicool.com/papers/Persistence.html">Providing Persistence for World-Wide-Web Applications</a>,
Proceedings of the 5th Python Workshop.</p>
-<p><a name="2">[2]</a> Page, R. and Cropper, S., <a href="http://www.digicool.com/papers/DocumentTemplate.html">Document Template</a>,
+<p><a name="ref2">[2]</a> Page, R. and Cropper, S., <a href="http://www.digicool.com/papers/DocumentTemplate.html">Document Template</a>,
Proceedings of the 5th Python Workshop.</p>
-<p><a name="3">[3]</a> Beaudry, D., <a href="http://www.python.org/workshops/1994-11/BuiltInClasses/BuiltInClasses_1.html">Deriving Built-In Classes in Python</a>,
+<p><a name="ref3">[3]</a> Beaudry, D., <a href="http://www.python.org/workshops/1994-11/BuiltInClasses/BuiltInClasses_1.html">Deriving Built-In Classes in Python</a>,
Proceedings of the First International Python Workshop.</p>
-<p><a name="4">[4]</a> Van Rossum, G., <a href="http://www.python.org/workshops/1996-06/notes/thursday.html">Don Beaudry Hack - MESS</a>,
+<p><a name="ref4">[4]</a> Van Rossum, G., <a href="http://www.python.org/workshops/1996-06/notes/thursday.html">Don Beaudry Hack - MESS</a>,
presented in the Developer's Future Enhancements session of the
4th Python Workshop. </p>
-<p><a name="5">[5]</a> Fulton, J., <a href="http://www.digicool.com/jim/MetaType.c">Meta-Type Object</a>,
+<p><a name="ref5">[5]</a> Fulton, J., <a href="http://www.digicool.com/jim/MetaType.c">Meta-Type Object</a>,
This is a small proposal, the text of which is contained in a
sample implementation source file, </p>
-<p><a name="6">[6]</a> Beaudry, D., and Ascher, D., <a href="http://starship.skyport.net/~da/mess/">The Meta-Extension Set</a>.</p>
+<p><a name="ref6">[6]</a> Beaudry, D., and Ascher, D., <a href="http://starship.skyport.net/~da/mess/">The Meta-Extension Set</a>.</p>
</body>
</html>
=== Zope/lib/python/StructuredText/regressions/InnerLinks.ref 1.1 => 1.2 ===
<body>
<h1>This is the InnerLinkTest</h1>
-<p> see also <a href="#1">[1]</a> and <a href="#2">[2]</a></p>
-<p> <a name="1">[1]</a> "Zope Book" by Amos Lattmeier and Michel Pelletier</p>
-<p> <a name="2">[2]</a> "Python Book" by Guido van Rossum</p>
+<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>
-
=== Zope/lib/python/StructuredText/regressions/examples.ref 1.6 => 1.7 ===
<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="#1">[1]</a>:</p>
+<p> Here are a few presentation styles, in a list <a href="#ref1">[1]</a>:</p>
<ul>
<li><p>A word: <em>emphasized</em>.</p></li>
@@ -28,8 +28,8 @@
</p></li>
</ul>
-<p><a name="1">[1]</a> (The referring text should be a paragraph, not a header, and
-should contain a reference to this footnote, footnote "<a href="#1">[1]</a>".)<p> Some hrefs, in a definition list:</p>
+<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> _Regular_</dt>
<dd><a href="http://www.zope.org">http://www.zope.org/</a></dd>
=== Zope/lib/python/StructuredText/regressions/table.ref 1.3 => 1.4 ===
<body>
-<table border=1 cellpadding=2>
+<table border="1" cellpadding="2">
<tr>
-<th colspan=1 align=left valign=middle><p> Function </p>
+<th colspan="1" align="left" valign="middle"><p> Function </p>
</th>
-<th colspan=1 align=left valign=middle><p> Documentation </p>
+<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 colspan="1" align="left" valign="top"><p> <code>__str__</code> </p>
</td>
-<td colspan=1 align=left valign=middle><p> This method converts the
+<td colspan="1" align="left" valign="middle"><p> This method converts the
the object to a string. </p>
<ul>
<li><p>Blah </p></li>
-<li><p>Blaf <table border=1 cellpadding=2>
+<li><p>Blaf <table border="1" cellpadding="2">
<tr>
-<th colspan=1 align=center valign=top><p> Name </p>
+<th colspan="1" align="center" valign="top"><p> Name </p>
</th>
-<th colspan=1 align=left valign=middle><p> Favorite
+<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 colspan="1" align="left" valign="middle"><p> Jim </p>
</td>
-<td colspan=1 align=center valign=middle><p> Red </p>
+<td colspan="1" align="center" valign="middle"><p> Red </p>
</td>
</tr>
<tr>
-<td colspan=1 align=left valign=middle><p> John </p>
+<td colspan="1" align="left" valign="middle"><p> John </p>
</td>
-<td colspan=1 align=center valign=middle><p> Blue </p>
+<td colspan="1" align="center" valign="middle"><p> Blue </p>
</td>
</tr>
</table>
</p></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>
=== Zope/lib/python/StructuredText/regressions/table.stx 1.1 => 1.2 ===
| | |--------------------------| |
|-------------------------------------------------|
+
+
+
+|---------------------------------------|
+| This should give a row with colspan 3 |
+|---------------------------------------|
+| Col 1 | Col 2 | Col 3 |
+|---------------------------------------|
+| Col 1 | Col 2 |
+|---------------------------------------|
+| Col 1 | Col 2 |
+|---------------------------------------|
+