lint: fix C4xx comprehension errors

Also any Python 2 clean-up that was handy.

Author: scanny

features/steps/styles.py

@@ -318,14 +318,14 @@ def then_I_can_access_a_style_by_style_id(context):
 
 @then("I can iterate over its styles")
 def then_I_can_iterate_over_its_styles(context):
-    styles = [s for s in context.document.styles]
+    styles = list(context.document.styles)
     assert len(styles) > 0
     assert all(isinstance(s, BaseStyle) for s in styles)
 
 
 @then("I can iterate over the latent styles")
 def then_I_can_iterate_over_the_latent_styles(context):
-    latent_styles = [ls for ls in context.latent_styles]
+    latent_styles = list(context.latent_styles)
     assert len(latent_styles) == 137
     assert all(isinstance(ls, _LatentStyle) for ls in latent_styles)
 

features/steps/tabstops.py

@@ -96,7 +96,7 @@ def then_I_can_access_a_tab_stop_by_index(context):
 
 @then("I can iterate the TabStops object")
 def then_I_can_iterate_the_TabStops_object(context):
-    items = [ts for ts in context.tab_stops]
+    items = list(context.tab_stops)
     assert len(items) == 3
     assert all(isinstance(item, TabStop) for item in items)
 

pyproject.toml

@@ -60,7 +60,7 @@ ignore = [
     "COM812",   # -- over-aggressively insists on trailing commas where not desired --
 ]
 select = [
-    # "C4",       # -- flake8-comprehensions --
+    "C4",       # -- flake8-comprehensions --
     "COM",      # -- flake8-commas --
     "E",        # -- pycodestyle errors --
     "F",        # -- pyflakes --

src/docx/document.py

@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """|Document| and closely related objects"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK

src/docx/enum/base.py

@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Base classes and other objects used by enumerations
-"""
-
-from __future__ import absolute_import, print_function
+"""Base classes and other objects used by enumerations."""
 
 import sys
 import textwrap
@@ -358,7 +352,7 @@ def _get_or_add_member_to_xml(clsdict):
         Add the enum -> xml value mapping to the enumeration class state
         """
         if "_member_to_xml" not in clsdict:
-            clsdict["_member_to_xml"] = dict()
+            clsdict["_member_to_xml"] = {}
         return clsdict["_member_to_xml"]
 
     @staticmethod
@@ -367,5 +361,5 @@ def _get_or_add_xml_to_member(clsdict):
         Add the xml -> enum value mapping to the enumeration class state
         """
         if "_xml_to_member" not in clsdict:
-            clsdict["_xml_to_member"] = dict()
+            clsdict["_xml_to_member"] = {}
         return clsdict["_xml_to_member"]

src/docx/image/png.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from .constants import MIME_TYPE, PNG_CHUNK_TYPE
 from .exceptions import InvalidImageStreamError
 from .helpers import BIG_ENDIAN, StreamReader
@@ -127,7 +123,7 @@ def from_stream(cls, stream):
         Return a |_Chunks| instance containing the PNG chunks in *stream*.
         """
         chunk_parser = _ChunkParser.from_stream(stream)
-        chunks = [chunk for chunk in chunk_parser.iter_chunks()]
+        chunks = list(chunk_parser.iter_chunks())
         return cls(chunks)
 
     @property

src/docx/image/tiff.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from .constants import MIME_TYPE, TIFF_FLD, TIFF_TAG
 from .helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from .image import BaseImageHeader
@@ -177,7 +173,7 @@ def from_stream(cls, stream, offset):
         *offset*.
         """
         ifd_parser = _IfdParser(stream, offset)
-        entries = dict((e.tag, e.value) for e in ifd_parser.iter_entries())
+        entries = {e.tag: e.value for e in ifd_parser.iter_entries()}
         return cls(entries)
 
     def get(self, tag_code, default=None):

src/docx/opc/package.py

@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Objects that implement reading and writing OPC packages."""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.part import PartFactory
@@ -70,7 +66,7 @@ def iter_parts(self):
         performing a depth-first traversal of the rels graph.
         """
 
-        def walk_parts(source, visited=list()):
+        def walk_parts(source, visited=[]):
             for rel in source.rels.values():
                 if rel.is_external:
                     continue
@@ -146,7 +142,7 @@ def parts(self):
         Return a list containing a reference to each of the parts in this
         package.
         """
-        return [part for part in self.iter_parts()]
+        return list(self.iter_parts())
 
     def relate_to(self, part, reltype):
         """

src/docx/opc/pkgwriter.py

@@ -1,18 +1,15 @@
-# encoding: utf-8
+"""Provides low-level, write-only API to serialized (OPC) package.
 
+OPC stands for Open Packaging Convention. This is e, essentially an implementation of
+OpcPackage.save().
 """
-Provides a low-level, write-only API to a serialized Open Packaging
-Convention (OPC) package, essentially an implementation of OpcPackage.save()
-"""
-
-from __future__ import absolute_import
 
-from .constants import CONTENT_TYPE as CT
-from .oxml import CT_Types, serialize_part_xml
-from .packuri import CONTENT_TYPES_URI, PACKAGE_URI
-from .phys_pkg import PhysPkgWriter
-from .shared import CaseInsensitiveDict
-from .spec import default_content_types
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.oxml import CT_Types, serialize_part_xml
+from docx.opc.packuri import CONTENT_TYPES_URI, PACKAGE_URI
+from docx.opc.phys_pkg import PhysPkgWriter
+from docx.opc.shared import CaseInsensitiveDict
+from docx.opc.spec import default_content_types
 
 
 class PackageWriter(object):
@@ -75,7 +72,7 @@ class _ContentTypesItem(object):
 
     def __init__(self):
         self._defaults = CaseInsensitiveDict()
-        self._overrides = dict()
+        self._overrides = {}
 
     @property
     def blob(self):

src/docx/oxml/ns.py

@@ -19,7 +19,7 @@
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 
-pfxmap = dict((value, key) for key, value in nsmap.items())
+pfxmap = {value: key for key, value in nsmap.items()}
 
 
 class NamespacePrefixedTag(str):
@@ -94,7 +94,7 @@ def nspfxmap(*nspfxs):
     *nspfxs*. Any number of namespace prefixes can be supplied, e.g.
     namespaces('a', 'r', 'p').
     """
-    return dict((pfx, nsmap[pfx]) for pfx in nspfxs)
+    return {pfx: nsmap[pfx] for pfx in nspfxs}
 
 
 def qn(tag):