[Docutils-checkins] docutils/docutils/parsers/rst states.py,1.31,1.32

[David G. <go...@us...>]

Update of /cvsroot/docutils/docutils/docutils/parsers/rst
In directory usw-pr-cvs1:/tmp/cvs-serv2093/docutils/docutils/parsers/rst

Modified Files:
	states.py 
Log Message:
Renamed ``Stuff`` to ``Struct``.  Fixed a bug.

Index: states.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/parsers/rst/states.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- states.py	18 Oct 2002 04:55:19 -0000	1.31
+++ states.py	18 Oct 2002 23:44:47 -0000	1.32
@@ -28,7 +28,7 @@
     - `SpecializedText`: Superclass for continuation lines of Text-variants.
     - `Definition`: Second line of potential definition_list_item.
     - `Line`: Second line of overlined section title or transition marker.
-    - `Stuff`: An auxiliary collection class.
+    - `Struct`: An auxiliary collection class.
 
 :Exception classes:
     - `MarkupError`
@@ -120,9 +120,9 @@
 class MarkupMismatch(Exception): pass
 
 
-class Stuff:
+class Struct:
 
-    """Stores a bunch of stuff for dotted-attribute access."""
+    """Stores data attributes for dotted-attribute access."""
 
     def __init__(self, **keywordargs):
         self.__dict__.update(keywordargs)
@@ -151,12 +151,12 @@
         if inliner is None:
             inliner = Inliner()
         inliner.init_customizations(document.settings)
-        self.memo = Stuff(document=document,
-                          reporter=document.reporter,
-                          language=self.language,
-                          title_styles=[],
-                          section_level=0,
-                          inliner=inliner)
+        self.memo = Struct(document=document,
+                           reporter=document.reporter,
+                           language=self.language,
+                           title_styles=[],
+                           section_level=0,
+                           inliner=inliner)
         self.document = self.memo.document
         self.attach_observer(self.document.note_state_machine_change)
         self.reporter = self.memo.reporter
@@ -524,7 +524,7 @@
                )
               ]
              )
-    patterns = Stuff(
+    patterns = Struct(
           initial=build_regexp(parts),
           emphasis=re.compile(non_whitespace_escape_before
                               + r'(\*)' + end_string_suffix),
@@ -903,13 +903,13 @@
     Generic classifier of the first line of a block.
     """
 
-    enum = Stuff()
+    enum = Struct()
     """Enumerated list parsing information."""
 
     enum.formatinfo = {
-          'parens': Stuff(prefix='(', suffix=')', start=1, end=-1),
-          'rparen': Stuff(prefix='', suffix=')', start=0, end=-1),
-          'period': Stuff(prefix='', suffix='.', start=0, end=-1)}
+          'parens': Struct(prefix='(', suffix=')', start=1, end=-1),
+          'rparen': Struct(prefix='', suffix=')', start=0, end=-1),
+          'period': Struct(prefix='', suffix='.', start=0, end=-1)}
     enum.formats = enum.formatinfo.keys()
     enum.sequences = ['arabic', 'loweralpha', 'upperalpha',
                       'lowerroman', 'upperroman'] # ORDERED!
@@ -1449,10 +1449,10 @@
         return row
 
 
-    explicit = Stuff()
+    explicit = Struct()
     """Patterns and constants used for explicit markup recognition."""
 
-    explicit.patterns = Stuff(
+    explicit.patterns = Struct(
           target=re.compile(r"""
                             (
                               _               # anonymous target
@@ -1903,10 +1903,7 @@
                 try:
                     return method(self, expmatch)
                 except MarkupError, (message, lineno): # never reached?
-                    errors.append(
-                        self.reporter.warning(
-                        '%s: %s' % (detail.__class__.__name__, message),
-                        line=lineno))
+                    errors.append(self.reporter.warning(message, line=lineno))
                     break
         nodelist, blank_finish = self.comment(match)
         return nodelist + errors, blank_finish