diff options
| -rw-r--r-- | docutils/docutils/parsers/rst/tableparser.py | 3 | ||||
| -rw-r--r-- | docutils/docutils/statemachine.py | 3 | ||||
| -rw-r--r-- | docutils/docutils/writers/odf_odt/__init__.py | 6 | ||||
| -rw-r--r-- | docutils/test/DocutilsTestSupport.py | 10 |
4 files changed, 7 insertions, 15 deletions
diff --git a/docutils/docutils/parsers/rst/tableparser.py b/docutils/docutils/parsers/rst/tableparser.py index b51766fdd..ba54766eb 100644 --- a/docutils/docutils/parsers/rst/tableparser.py +++ b/docutils/docutils/parsers/rst/tableparser.py @@ -290,8 +290,7 @@ class GridTableParser(TableParser): 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 diff --git a/docutils/docutils/statemachine.py b/docutils/docutils/statemachine.py index ce04600c8..ec5351887 100644 --- a/docutils/docutils/statemachine.py +++ b/docutils/docutils/statemachine.py @@ -1297,8 +1297,7 @@ class ViewList(object): 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 diff --git a/docutils/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py index e54674f90..130d896fb 100644 --- a/docutils/docutils/writers/odf_odt/__init__.py +++ b/docutils/docutils/writers/odf_odt/__init__.py @@ -1115,10 +1115,8 @@ class ODFTranslator(nodes.GenericNodeVisitor): 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: diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py index 50165e09c..658ae62a6 100644 --- a/docutils/test/DocutilsTestSupport.py +++ b/docutils/test/DocutilsTestSupport.py @@ -810,14 +810,10 @@ class HtmlWriterPublishPartsTestCase(WriterPublishTestCase): 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()): - if not parts[key]: - del parts[key] - # standard output format: - keys = sorted(parts.keys()) output = [] - for key in keys: + for key in sorted(parts.keys()): + if not parts[key]: + continue output.append("%r: '''%s'''" % (key, parts[key])) if output[-1].endswith("\n'''"): |