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

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

Revision: 8373
          http://sourceforge.net/p/docutils/code/8373
Author:   milde
Date:     2019-08-27 12:11:30 +0000 (Tue, 27 Aug 2019)
Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    trunk/docutils/docutils/parsers/rst/tableparser.py
    trunk/docutils/docutils/statemachine.py
    trunk/docutils/docutils/writers/odf_odt/__init__.py
    trunk/docutils/test/DocutilsTestSupport.py

Modified: trunk/docutils/docutils/parsers/rst/tableparser.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/tableparser.py	2019-08-27 12:11:15 UTC (rev 8372)
+++ trunk/docutils/docutils/parsers/rst/tableparser.py	2019-08-27 12:11:30 UTC (rev 8373)
@@ -290,8 +290,7 @@
         rowindex = {}
         for i in range(len(rowseps)):
             rowindex[rowseps[i]] = i    # row boundary -> row number mapping
-        colseps = list(self.colseps.keys())   # list of column boundaries
-        colseps.sort()
+        colseps = sorted(self.colseps.keys())   # list of column boundaries
         colindex = {}
         for i in range(len(colseps)):
             colindex[colseps[i]] = i    # column boundary -> col number map

Modified: trunk/docutils/docutils/statemachine.py
===================================================================
--- trunk/docutils/docutils/statemachine.py	2019-08-27 12:11:15 UTC (rev 8372)
+++ trunk/docutils/docutils/statemachine.py	2019-08-27 12:11:30 UTC (rev 8373)
@@ -1297,8 +1297,7 @@
         self.parent = None
 
     def sort(self, *args):
-        tmp = list(zip(self.data, self.items))
-        tmp.sort(*args)
+        tmp = sorted(zip(self.data, self.items), *args)
         self.data = [entry[0] for entry in tmp]
         self.items = [entry[1] for entry in tmp]
         self.parent = None

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2019-08-27 12:11:15 UTC (rev 8372)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2019-08-27 12:11:30 UTC (rev 8373)
@@ -1115,10 +1115,8 @@
     def setup_paper(self, root_el):
         try:
             fin = os.popen("paperconf -s 2> /dev/null")
-            content = fin.read()
-            content = content.split()
-            content = list(map(float, content))
-            w, h = content
+            dimensions = fin.read().split()
+            w, h = (float(s) for s in dimensions)
         except (IOError, ValueError):
             w, h = 612, 792     # default to Letter
         finally:

Modified: trunk/docutils/test/DocutilsTestSupport.py
===================================================================
--- trunk/docutils/test/DocutilsTestSupport.py	2019-08-27 12:11:15 UTC (rev 8372)
+++ trunk/docutils/test/DocutilsTestSupport.py	2019-08-27 12:11:30 UTC (rev 8373)
@@ -810,14 +810,10 @@
             self.standard_html_meta_value, '...')
         parts['html_prolog'] = parts['html_prolog'].replace(
             self.standard_html_prolog, '')
-        # remove empty values:
-        for key in list(parts.keys()):
+        output = []
+        for key in sorted(parts.keys()):
             if not parts[key]:
-                del parts[key]
-        # standard output format:
-        keys = sorted(parts.keys())
-        output = []
-        for key in keys:
+                continue
             output.append("%r: '''%s'''"
                           % (key, parts[key]))
             if output[-1].endswith("\n'''"):

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