[Docutils-checkins] SF.net SVN: docutils:[8355] trunk/docutils

[<mi...@us...>]

Revision: 8355
          http://sourceforge.net/p/docutils/code/8355
Author:   milde
Date:     2019-08-26 16:42:50 +0000 (Mon, 26 Aug 2019)
Log Message:
-----------
py3: Replace 'types.SliceType' with slice, remove 'types.ClassType'.

These types have been removed in Python 3,
`SliceType` is an alias for `slice` already in Python 2.7,
`ClassType` is for user-defined old-style classes (we now use only new style classes).

Signed-off-by: Stephen Finucane <st...@th...>

Modified Paths:
--------------
    trunk/docutils/docutils/nodes.py
    trunk/docutils/docutils/statemachine.py
    trunk/docutils/test/test_nodes.py

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2019-08-26 16:42:38 UTC (rev 8354)
+++ trunk/docutils/docutils/nodes.py	2019-08-26 16:42:50 UTC (rev 8355)
@@ -27,7 +27,6 @@
 import os
 import re
 import warnings
-import types
 import unicodedata
 
 if sys.version_info >= (3, 0):
@@ -257,11 +256,11 @@
         if include_self and descend and not siblings:
             if condition is None:
                 return self._all_traverse()
-            elif isinstance(condition, (types.ClassType, type)):
+            elif isinstance(condition, type):
                 return self._fast_traverse(condition)
         # Check if `condition` is a class (check for TypeType for Python
         # implementations that use only new-style classes, like PyPy).
-        if isinstance(condition, (types.ClassType, type)):
+        if isinstance(condition, type):
             node_class = condition
             def condition(node, node_class=node_class):
                 return isinstance(node, node_class)
@@ -590,7 +589,7 @@
             return self.attributes[key]
         elif isinstance(key, int):
             return self.children[key]
-        elif isinstance(key, types.SliceType):
+        elif isinstance(key, slice):
             assert key.step in (None, 1), 'cannot handle slice with stride'
             return self.children[key.start:key.stop]
         else:
@@ -603,7 +602,7 @@
         elif isinstance(key, int):
             self.setup_child(item)
             self.children[key] = item
-        elif isinstance(key, types.SliceType):
+        elif isinstance(key, slice):
             assert key.step in (None, 1), 'cannot handle slice with stride'
             for node in item:
                 self.setup_child(node)
@@ -617,7 +616,7 @@
             del self.attributes[key]
         elif isinstance(key, int):
             del self.children[key]
-        elif isinstance(key, types.SliceType):
+        elif isinstance(key, slice):
             assert key.step in (None, 1), 'cannot handle slice with stride'
             del self.children[key.start:key.stop]
         else:

Modified: trunk/docutils/docutils/statemachine.py
===================================================================
--- trunk/docutils/docutils/statemachine.py	2019-08-26 16:42:38 UTC (rev 8354)
+++ trunk/docutils/docutils/statemachine.py	2019-08-26 16:42:50 UTC (rev 8355)
@@ -109,7 +109,6 @@
 
 import sys
 import re
-import types
 import unicodedata
 from docutils import utils
 from docutils.utils.error_reporting import ErrorOutput
@@ -1148,7 +1147,7 @@
     # just works.
 
     def __getitem__(self, i):
-        if isinstance(i, types.SliceType):
+        if isinstance(i, slice):
             assert i.step in (None, 1),  'cannot handle slice with stride'
             return self.__class__(self.data[i.start:i.stop],
                                   items=self.items[i.start:i.stop],
@@ -1157,7 +1156,7 @@
             return self.data[i]
 
     def __setitem__(self, i, item):
-        if isinstance(i, types.SliceType):
+        if isinstance(i, slice):
             assert i.step in (None, 1), 'cannot handle slice with stride'
             if not isinstance(item, ViewList):
                 raise TypeError('assigning non-ViewList to ViewList slice')

Modified: trunk/docutils/test/test_nodes.py
===================================================================
--- trunk/docutils/test/test_nodes.py	2019-08-26 16:42:38 UTC (rev 8354)
+++ trunk/docutils/test/test_nodes.py	2019-08-26 16:42:50 UTC (rev 8355)
@@ -11,7 +11,7 @@
 
 import sys
 import unittest
-import types
+
 import DocutilsTestSupport              # must be imported before docutils
 from DocutilsTestSupport import nodes, utils
 
@@ -359,7 +359,7 @@
         node_class_names = []
         for x in dir(nodes):
             c = getattr(nodes, x)
-            if isinstance(c, (type, types.ClassType)) and \
+            if isinstance(c, type) and \
                    issubclass(c, nodes.Node) and len(c.__bases__) > 1:
                 node_class_names.append(x)
         node_class_names.sort()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.