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

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

Revision: 8357
          http://sourceforge.net/p/docutils/code/8357
Author:   milde
Date:     2019-08-26 16:44:51 +0000 (Mon, 26 Aug 2019)
Log Message:
-----------
py3: Use 'sorted(foo)' instead of 'foo.sort()'

This works with iterators also (like 'dict.keys()' in Python 3)

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

Modified Paths:
--------------
    trunk/docutils/docutils/nodes.py
    trunk/docutils/docutils/parsers/rst/tableparser.py
    trunk/docutils/docutils/transforms/__init__.py
    trunk/docutils/docutils/utils/math/math2html.py
    trunk/docutils/docutils/writers/_html_base.py
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/DocutilsTestSupport.py
    trunk/docutils/test/test_dependencies.py
    trunk/docutils/test/test_language.py
    trunk/docutils/tools/dev/generate_punctuation_chars.py
    trunk/docutils/tools/dev/unicode2rstsubs.py

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/docutils/nodes.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -649,8 +649,7 @@
         return atts
 
     def attlist(self):
-        attlist = self.non_default_attributes().items()
-        attlist.sort()
+        attlist = sorted(self.non_default_attributes().items())
         return attlist
 
     def get(self, key, failobj=None):
@@ -1782,8 +1781,7 @@
               '     .transform: %s.%s' % (self.transform.__module__,
                                           self.transform.__name__),
               '     .details:']
-        details = self.details.items()
-        details.sort()
+        details = sorted(self.details.items())
         for key, value in details:
             if isinstance(value, Node):
                 internals.append('%7s%s:' % ('', key))

Modified: trunk/docutils/docutils/parsers/rst/tableparser.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/tableparser.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/docutils/parsers/rst/tableparser.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -286,8 +286,7 @@
         From the data collected by `scan_cell()`, convert to the final data
         structure.
         """
-        rowseps = self.rowseps.keys()   # list of row boundaries
-        rowseps.sort()
+        rowseps = sorted(self.rowseps.keys())   # list of row boundaries
         rowindex = {}
         for i in range(len(rowseps)):
             rowindex[rowseps[i]] = i    # row boundary -> row number mapping

Modified: trunk/docutils/docutils/transforms/__init__.py
===================================================================
--- trunk/docutils/docutils/transforms/__init__.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/docutils/transforms/__init__.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -153,8 +153,7 @@
         unknown_reference_resolvers = []
         for i in components:
             unknown_reference_resolvers.extend(i.unknown_reference_resolvers)
-        decorated_list = [(f.priority, f) for f in unknown_reference_resolvers]
-        decorated_list.sort()
+        decorated_list = sorted([(f.priority, f) for f in unknown_reference_resolvers])
         self.unknown_reference_resolvers.extend([f[1] for f in decorated_list])
 
     def apply_transforms(self):

Modified: trunk/docutils/docutils/utils/math/math2html.py
===================================================================
--- trunk/docutils/docutils/utils/math/math2html.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/docutils/utils/math/math2html.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -2193,9 +2193,8 @@
 
   def escape(self, line, replacements = EscapeConfig.entities):
     "Escape a line with replacements from elyxer.a map"
-    pieces = replacements.keys()
+    pieces = sorted(replacements.keys())
     # do them in order
-    pieces.sort()
     for piece in pieces:
       if piece in line:
         line = line.replace(piece, replacements[piece])

Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/docutils/writers/_html_base.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -366,8 +366,7 @@
                     # Non-empty tag.  Place the auxiliary <span> tag
                     # *inside* the element, as the first child.
                     suffix += '<span id="%s"></span>' % id
-        attlist = atts.items()
-        attlist.sort()
+        attlist = sorted(atts.items())
         parts = [tagname]
         for name, value in attlist:
             # value=None was used for boolean attributes without

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -457,8 +457,7 @@
     """
     def sortedkeys(self):
         """Return sorted list of keys"""
-        keys = self.keys()
-        keys.sort()
+        keys = sorted(self.keys())
         return keys
 
     def sortedvalues(self):

Modified: trunk/docutils/test/DocutilsTestSupport.py
===================================================================
--- trunk/docutils/test/DocutilsTestSupport.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/test/DocutilsTestSupport.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -815,8 +815,7 @@
             if not parts[key]:
                 del parts[key]
         # standard output format:
-        keys = parts.keys()
-        keys.sort()
+        keys = sorted(parts.keys())
         output = []
         for key in keys:
             output.append("%r: '''%s'''"

Modified: trunk/docutils/test/test_dependencies.py
===================================================================
--- trunk/docutils/test/test_dependencies.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/test/test_dependencies.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -54,9 +54,8 @@
         if PIL:
             keys += ['figure-image']
         expected = [paths[key] for key in keys]
-        record = self.get_record(writer_name='xml')
+        record = sorted(self.get_record(writer_name='xml'))
         # the order of the files is arbitrary
-        record.sort()
         expected.sort()
         self.assertEqual(record, expected)
 
@@ -67,9 +66,8 @@
         expected = [paths[key] for key in keys]
         # stylesheets are tested separately in test_stylesheet_dependencies():
         so = {'stylesheet_path': None, 'stylesheet': None}
-        record = self.get_record(writer_name='html', settings_overrides=so)
+        record = sorted(self.get_record(writer_name='html', settings_overrides=so))
         # the order of the files is arbitrary
-        record.sort()
         expected.sort()
         self.assertEqual(record, expected)
 
@@ -82,9 +80,8 @@
         if PIL:
             keys += ['figure-image']
         expected = [paths[key] for key in keys]
-        record = self.get_record(writer_name='latex')
+        record = sorted(self.get_record(writer_name='latex'))
         # the order of the files is arbitrary
-        record.sort()
         expected.sort()
         self.assertEqual(record, expected)
 

Modified: trunk/docutils/test/test_language.py
===================================================================
--- trunk/docutils/test/test_language.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/test/test_language.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -150,8 +150,7 @@
             except Exception as error:
                 failures.append('"%s": %s' % (d, error))
         inverted = self._invert(module.directives)
-        canonical = directives._directive_registry.keys()
-        canonical.sort()
+        canonical = sorted(directives._directive_registry.keys())
         canonical.remove('restructuredtext-test-directive')
         for name in canonical:
             if name not in inverted:
@@ -185,8 +184,7 @@
             except KeyError as error:
                 failures.append('"%s": %s' % (d, error))
         inverted = self._invert(module.roles)
-        canonical = roles._role_registry.keys()
-        canonical.sort()
+        canonical = sorted(roles._role_registry.keys())
         canonical.remove('restructuredtext-unimplemented-role')
         for name in canonical:
             if name not in inverted:

Modified: trunk/docutils/tools/dev/generate_punctuation_chars.py
===================================================================
--- trunk/docutils/tools/dev/generate_punctuation_chars.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/tools/dev/generate_punctuation_chars.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -269,8 +269,7 @@
     Sort string and replace 'cdef' by 'c-f' and similar.
     """
     l =[]
-    s = [ord(ch) for ch in s]
-    s.sort()
+    s = sorted([ord(ch) for ch in s])
     for n in s:
         try:
             if l[-1][-1]+1 == n:

Modified: trunk/docutils/tools/dev/unicode2rstsubs.py
===================================================================
--- trunk/docutils/tools/dev/unicode2rstsubs.py	2019-08-26 16:44:19 UTC (rev 8356)
+++ trunk/docutils/tools/dev/unicode2rstsubs.py	2019-08-26 16:44:51 UTC (rev 8357)
@@ -163,8 +163,7 @@
         return name
 
     def write_sets(self):
-        sets = list(self.sets.keys())
-        sets.sort()
+        sets = sorted(self.sets.keys())
         for set_name in sets:
             self.write_set(set_name)
 
@@ -177,8 +176,7 @@
         print('writing file "%s"' % outname)
         outfile.write(self.header + '\n')
         set = self.sets[set_name]
-        entities = [(e.lower(), e) for e in set.keys()]
-        entities.sort()
+        entities = sorted([(e.lower(), e) for e in set.keys()])
         longest = 0
         for _, entity_name in entities:
             longest = max(longest, len(entity_name))

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