Code modernisation. Use literals.

Merger of 2 patches by Adam Turner.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8969 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

6 files changed, 12 insertions, 13 deletions

diff --git a/docutils/docutils/transforms/universal.py b/docutils/docutils/transforms/universal.py
index 715c724b6..e31249593 100644
--- a/docutils/docutils/transforms/universal.py
+++ b/docutils/docutils/transforms/universal.py
@@ -198,8 +198,8 @@ class StripClassesAndElements(Transform):
 
     def apply(self):
         if self.document.settings.strip_elements_with_classes:
-            self.strip_elements = set(
-                self.document.settings.strip_elements_with_classes)
+            self.strip_elements = {*self.document.settings
+                                   .strip_elements_with_classes}
             # Iterate over a tuple as removing the current node
             # corrupts the iterator returned by `iter`:
             for node in tuple(self.document.findall(self.check_classes)):
diff --git a/docutils/docutils/utils/math/math2html.py b/docutils/docutils/utils/math/math2html.py
index 00d1cdff6..9f57eeb69 100755
--- a/docutils/docutils/utils/math/math2html.py
+++ b/docutils/docutils/utils/math/math2html.py
@@ -625,7 +625,7 @@ class Options(object):
   simplemath = False
   showlines = True
 
-  branches = dict()
+  branches = {}
 
   def parseoptions(self, args):
     "Parse command line options"
@@ -734,7 +734,7 @@ class Parser(object):
 
   def __init__(self):
     self.begin = 0
-    self.parameters = dict()
+    self.parameters = {}
 
   def parseheader(self, reader):
     "Parse the header"
@@ -2042,7 +2042,7 @@ class FormulaFactory(object):
 
   def __init__(self):
     "Initialize the map of instances."
-    self.instances = dict()
+    self.instances = {}
 
   def detecttype(self, type, pos):
     "Detect a bit of a given type."
@@ -2933,7 +2933,7 @@ class ParameterFunction(CommandBit):
 
   def readparams(self, readtemplate, pos):
     "Read the params according to the template."
-    self.params = dict()
+    self.params = {}
     for paramdef in self.paramdefs(readtemplate):
       paramdef.read(pos, self)
       self.params['$' + paramdef.name] = paramdef
diff --git a/docutils/docutils/writers/html5_polyglot/__init__.py b/docutils/docutils/writers/html5_polyglot/__init__.py
index 863629360..5ddf1b848 100644
--- a/docutils/docutils/writers/html5_polyglot/__init__.py
+++ b/docutils/docutils/writers/html5_polyglot/__init__.py
@@ -155,7 +155,7 @@ class HTMLTranslator(writers._html_base.HTMLTranslator):
         # <figcaption> is closed in depart_figure(), as legend may follow.
 
     # use HTML block-level tags if matching class value found
-    supported_block_tags = set(('ins', 'del'))
+    supported_block_tags = {'ins', 'del'}
     def visit_container(self, node):
         # If there is exactly one of the "supported block tags" in
         # the list of class values, use it as tag name:
@@ -301,9 +301,9 @@ class HTMLTranslator(writers._html_base.HTMLTranslator):
         pass
 
     # use HTML text-level tags if matching class value found
-    supported_inline_tags = set(('code', 'kbd', 'dfn', 'samp', 'var',
-                                 'bdi', 'del', 'ins', 'mark', 'small',
-                                 'b', 'i', 'q', 's', 'u'))
+    supported_inline_tags = {'code', 'kbd', 'dfn', 'samp', 'var',
+                             'bdi', 'del', 'ins', 'mark', 'small',
+                             'b', 'i', 'q', 's', 'u'}
     def visit_inline(self, node):
         # Use `supported_inline_tags` if found in class values
         classes = node['classes']
diff --git a/docutils/docutils/writers/latex2e/__init__.py b/docutils/docutils/writers/latex2e/__init__.py
index 00be00bc8..ddaf15584 100644
--- a/docutils/docutils/writers/latex2e/__init__.py
+++ b/docutils/docutils/writers/latex2e/__init__.py
@@ -388,7 +388,7 @@ class Babel(object):
         # zh-Latn:      Chinese Pinyin
         }
     # normalize (downcase) keys
-    language_codes = dict([(k.lower(), v) for (k, v) in language_codes.items()])
+    language_codes = {k.lower(): v for k, v in language_codes.items()}
 
     warn_msg = 'Language "%s" not supported by LaTeX (babel)'
 
diff --git a/docutils/docutils/writers/xetex/__init__.py b/docutils/docutils/writers/xetex/__init__.py
index 8d6208d21..b0be1744c 100644
--- a/docutils/docutils/writers/xetex/__init__.py
+++ b/docutils/docutils/writers/xetex/__init__.py
@@ -96,7 +96,7 @@ class Babel(latex2e.Babel):
         # zh-Latn:      ???        #     Chinese Pinyin
         })
     # normalize (downcase) keys
-    language_codes = dict([(k.lower(), v) for (k, v) in language_codes.items()])
+    language_codes = {k.lower(): v for k, v in language_codes.items()}
 
     # Languages without Polyglossia support:
     for key in ('af',           # 'afrikaans',
diff --git a/docutils/test/local-parser.py b/docutils/test/local-parser.py
index 265a04baa..97fb23b79 100644
--- a/docutils/test/local-parser.py
+++ b/docutils/test/local-parser.py
@@ -16,5 +16,4 @@ class Parser(parsers.Parser):
 
     def parser(self, inputstring, document):
         self.setup_parse(inputstring, document)
-        document = dict()
         self.finish_parse()