16 files changed, 61 insertions, 37 deletions
diff --git a/docutils/docutils/__init__.py b/docutils/docutils/__init__.py
index 4597641d7..d96c045d1 100644
--- a/docutils/docutils/__init__.py
+++ b/docutils/docutils/__init__.py
@@ -92,7 +92,7 @@ class ApplicationError(StandardError): pass
 class DataError(ApplicationError): pass
 
 
-class SettingsSpec:
+class SettingsSpec(object):
 
     """
     Runtime setting specification base class.
diff --git a/docutils/docutils/core.py b/docutils/docutils/core.py
index 9199bc455..02f7b763b 100644
--- a/docutils/docutils/core.py
+++ b/docutils/docutils/core.py
@@ -23,7 +23,7 @@ from docutils.transforms import Transformer
 from docutils.utils.error_reporting import ErrorOutput, ErrorString
 import docutils.readers.doctree
 
-class Publisher:
+class Publisher(object):
 
     """
     A facade encapsulating the high-level logic of a Docutils system.
diff --git a/docutils/docutils/nodes.py b/docutils/docutils/nodes.py
index bd5780428..d41a20e85 100644
--- a/docutils/docutils/nodes.py
+++ b/docutils/docutils/nodes.py
@@ -1112,12 +1112,12 @@ class FixedTextElement(TextElement):
 #  Mixins
 # ========
 
-class Resolvable:
+class Resolvable(object):
 
     resolved = 0
 
 
-class BackLinkable:
+class BackLinkable(object):
 
     def add_backref(self, refid):
         self['backrefs'].append(refid)
@@ -1127,39 +1127,63 @@ class BackLinkable:
 #  Element Categories
 # ====================
 
-class Root: pass
+class Root(object):
+    pass
+
+
+class Titular(object):
+    pass
 
-class Titular: pass
 
-class PreBibliographic:
+class PreBibliographic(object):
     """Category of Node which may occur before Bibliographic Nodes."""
 
-class Bibliographic: pass
 
-class Decorative(PreBibliographic): pass
+class Bibliographic(object):
+    pass
+
+
+class Decorative(PreBibliographic):
+    pass
+
+
+class Structural(object):
+    pass
+
+
+class Body(object):
+    pass
 
-class Structural: pass
 
-class Body: pass
+class General(Body):
+    pass
 
-class General(Body): pass
 
 class Sequential(Body):
     """List-like elements."""
 
+
 class Admonition(Body): pass
 
+
 class Special(Body):
     """Special internal body elements."""
 
+
 class Invisible(PreBibliographic):
     """Internal elements that don't appear in output."""
 
-class Part: pass
 
-class Inline: pass
+class Part(object):
+    pass
+
+
+class Inline(object):
+    pass
+
 
-class Referential(Resolvable): pass
+class Referential(Resolvable):
+    pass
 
 
 class Targetable(Resolvable):
@@ -1171,7 +1195,7 @@ class Targetable(Resolvable):
     Required for MoinMoin/reST compatibility."""
 
 
-class Labeled:
+class Labeled(object):
     """Contains a `label` as its first element."""
 
 
@@ -1856,7 +1880,7 @@ node_class_names = """
 """A list of names of all concrete Node subclasses."""
 
 
-class NodeVisitor:
+class NodeVisitor(object):
 
     """
     "Visitor" pattern [GoF95]_ abstract superclass implementation for
diff --git a/docutils/docutils/parsers/rst/roles.py b/docutils/docutils/parsers/rst/roles.py
index 0397df778..9c029ec5b 100644
--- a/docutils/docutils/parsers/rst/roles.py
+++ b/docutils/docutils/parsers/rst/roles.py
@@ -181,7 +181,7 @@ def register_generic_role(canonical_name, node_class):
     register_canonical_role(canonical_name, role)
 
 
-class GenericRole:
+class GenericRole(object):
 
     """
     Generic interpreted text role, where the interpreted text is simply
@@ -198,7 +198,7 @@ class GenericRole:
         return [self.node_class(rawtext, text, **options)], []
 
 
-class CustomRole:
+class CustomRole(object):
 
     """
     Wrapper for custom interpreted text roles.
diff --git a/docutils/docutils/parsers/rst/states.py b/docutils/docutils/parsers/rst/states.py
index 86da79a0c..2e1859304 100644
--- a/docutils/docutils/parsers/rst/states.py
+++ b/docutils/docutils/parsers/rst/states.py
@@ -126,7 +126,7 @@ class ParserError(ApplicationError): pass
 class MarkupMismatch(Exception): pass
 
 
-class Struct:
+class Struct(object):
 
     """Stores data attributes for dotted-attribute access."""
 
@@ -459,7 +459,7 @@ def build_regexp(definition, compile=True):
         return regexp
 
 
-class Inliner:
+class Inliner(object):
 
     """
     Parse inline markup; call the `parse()` method.
diff --git a/docutils/docutils/parsers/rst/tableparser.py b/docutils/docutils/parsers/rst/tableparser.py
index e1a1717e5..299d01ff3 100644
--- a/docutils/docutils/parsers/rst/tableparser.py
+++ b/docutils/docutils/parsers/rst/tableparser.py
@@ -40,7 +40,7 @@ class TableMarkupError(DataError):
             DataError.__init__(self, *args)
 
 
-class TableParser:
+class TableParser(object):
 
     """
     Abstract superclass for the common parts of the syntax-specific parsers.
diff --git a/docutils/docutils/statemachine.py b/docutils/docutils/statemachine.py
index c59531e26..888cc9d22 100644
--- a/docutils/docutils/statemachine.py
+++ b/docutils/docutils/statemachine.py
@@ -114,7 +114,7 @@ from docutils import utils
 from docutils.utils.error_reporting import ErrorOutput
 
 
-class StateMachine:
+class StateMachine(object):
 
     """
     A finite state machine for text filters using regular expressions.
@@ -518,7 +518,7 @@ class StateMachine:
             observer(*info)
 
 
-class State:
+class State(object):
 
     """
     State superclass. Contains a list of transitions, and transition methods.
@@ -1034,7 +1034,7 @@ class StateWS(State):
         return context, next_state, results
 
 
-class _SearchOverride:
+class _SearchOverride(object):
 
     """
     Mix-in class to override `StateMachine` regular expression behavior.
@@ -1067,7 +1067,7 @@ class SearchStateMachineWS(_SearchOverride, StateMachineWS):
     pass
 
 
-class ViewList:
+class ViewList(object):
 
     """
     List with extended functionality: slices of ViewList objects are child
diff --git a/docutils/docutils/transforms/__init__.py b/docutils/docutils/transforms/__init__.py
index a748e2455..576394f13 100644
--- a/docutils/docutils/transforms/__init__.py
+++ b/docutils/docutils/transforms/__init__.py
@@ -30,7 +30,7 @@ from docutils import languages, ApplicationError, TransformSpec
 class TransformError(ApplicationError): pass
 
 
-class Transform:
+class Transform(object):
 
     """
     Docutils transform component abstract base class.
diff --git a/docutils/docutils/utils/__init__.py b/docutils/docutils/utils/__init__.py
index 3bea6ccd6..a0c9d4042 100644
--- a/docutils/docutils/utils/__init__.py
+++ b/docutils/docutils/utils/__init__.py
@@ -33,7 +33,7 @@ class SystemMessage(ApplicationError):
 class SystemMessagePropagation(ApplicationError): pass
 
 
-class Reporter:
+class Reporter(object):
 
     """
     Info/warning/error reporter and ``system_message`` element generator.
diff --git a/docutils/docutils/utils/math/latex2mathml.py b/docutils/docutils/utils/math/latex2mathml.py
index 661e6770e..982b3d6c1 100644
--- a/docutils/docutils/utils/math/latex2mathml.py
+++ b/docutils/docutils/utils/math/latex2mathml.py
@@ -155,7 +155,7 @@ negatables = {'=': u'\u2260',
               r'\equiv': u'\u2262'}
 
 # LaTeX to MathML translation stuff:
-class math:
+class math(object):
     """Base class for MathML elements."""
 
     nchildren = 1000000
diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index 0f743e168..b6c3cdeca 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -92,7 +92,7 @@ except:
 StringList.__repr__ = StringList.__str__
 
 
-class DevNull:
+class DevNull(object):
 
     """Output sink."""
 
diff --git a/docutils/test/alltests.py b/docutils/test/alltests.py
index 1f4a8f34c..183c5de77 100755
--- a/docutils/test/alltests.py
+++ b/docutils/test/alltests.py
@@ -25,7 +25,7 @@ import DocutilsTestSupport              # must be imported before docutils
 import docutils
 
 
-class Tee:
+class Tee(object):
 
     """Write to a file and a stream (default: stdout) simultaneously."""
 
diff --git a/docutils/test/test_statemachine.py b/docutils/test/test_statemachine.py
index 2422adcda..31b20ca37 100755
--- a/docutils/test/test_statemachine.py
+++ b/docutils/test/test_statemachine.py
@@ -203,7 +203,7 @@ class SMWSTests(unittest.TestCase):
         self.assertEqual(self.sm.run(testtext), expected)
 
 
-class EmptyClass:
+class EmptyClass(object):
     pass
 
 
diff --git a/docutils/tools/buildhtml.py b/docutils/tools/buildhtml.py
index 5cd8ef706..e1d58432c 100755
--- a/docutils/tools/buildhtml.py
+++ b/docutils/tools/buildhtml.py
@@ -107,7 +107,7 @@ class OptionParser(frontend.OptionParser):
         return source, destination
 
 
-class Struct:
+class Struct(object):
 
     """Stores data attributes for dotted-attribute access."""
 
@@ -115,7 +115,7 @@ class Struct:
         self.__dict__.update(keywordargs)
 
 
-class Builder:
+class Builder(object):
 
     def __init__(self):
         self.publishers = {
diff --git a/docutils/tools/dev/create_unimap.py b/docutils/tools/dev/create_unimap.py
index 9fb75bcc7..f89dad015 100755
--- a/docutils/tools/dev/create_unimap.py
+++ b/docutils/tools/dev/create_unimap.py
@@ -28,8 +28,8 @@ def w(s):
 text_map = {}
 math_map = {}
 
-class Visitor:
-    
+
+class Visitor(object):
     """Node visitor for contents of unicode.xml."""
 
     def visit_character(self, node):
diff --git a/docutils/tools/dev/unicode2rstsubs.py b/docutils/tools/dev/unicode2rstsubs.py
index b4e65e109..968ece6c6 100755
--- a/docutils/tools/dev/unicode2rstsubs.py
+++ b/docutils/tools/dev/unicode2rstsubs.py
@@ -59,7 +59,7 @@ def process(infile):
     grouper.write_sets()
 
 
-class CharacterEntitySetExtractor:
+class CharacterEntitySetExtractor(object):
 
     """
     Extracts character entity information from unicode.xml file, groups it by