lint: fix flake8-simplify diagnostics

Author: scanny

pyproject.toml

@@ -69,7 +69,7 @@ select = [
     "I",        # -- isort (imports) --
     "PLR0402",  # -- Name compared with itself like `foo == foo` --
     "PT",       # -- flake8-pytest-style --
-    # "SIM",      # -- flake8-simplify --
+    "SIM",      # -- flake8-simplify --
     "UP015",    # -- redundant `open()` mode parameter (like "r" is default) --
     "UP018",    # -- Unnecessary {literal_type} call like `str("abc")`. (rewrite as a literal) --
     "UP032",    # -- Use f-string instead of `.format()` call --

src/docx/image/tiff.py

@@ -225,11 +225,8 @@ def _IfdEntryFactory(stream_rdr, offset):
         TIFF_FLD.RATIONAL: _RationalIfdEntry,
     }
     field_type = stream_rdr.read_short(offset, 2)
-    if field_type in ifd_entry_classes:
-        entry_cls = ifd_entry_classes[field_type]
-    else:
-        entry_cls = _IfdEntry
-    return entry_cls.from_stream(stream_rdr, offset)
+    EntryCls = ifd_entry_classes.get(field_type, _IfdEntry)
+    return EntryCls.from_stream(stream_rdr, offset)
 
 
 class _IfdEntry(object):

src/docx/opc/packuri.py

@@ -1,8 +1,6 @@
-# encoding: utf-8
+"""Provides the PackURI value type.
 
-"""
-Provides the PackURI value type along with some useful known pack URI strings
-such as PACKAGE_URI.
+Also some useful known pack URI strings such as PACKAGE_URI.
 """
 
 import posixpath
@@ -18,7 +16,7 @@ class PackURI(str):
     _filename_re = re.compile("([a-zA-Z]+)([1-9][0-9]*)?")
 
     def __new__(cls, pack_uri_str):
-        if not pack_uri_str[0] == "/":
+        if pack_uri_str[0] != "/":
             tmpl = "PackURI must begin with slash, got '%s'"
             raise ValueError(tmpl % pack_uri_str)
         return str.__new__(cls, pack_uri_str)
@@ -96,11 +94,7 @@ def relative_ref(self, baseURI):
         """
         # workaround for posixpath bug in 2.6, doesn't generate correct
         # relative path when *start* (second) parameter is root ('/')
-        if baseURI == "/":
-            relpath = self[1:]
-        else:
-            relpath = posixpath.relpath(self, baseURI)
-        return relpath
+        return self[1:] if baseURI == "/" else posixpath.relpath(self, baseURI)
 
     @property
     def rels_uri(self):

src/docx/oxml/document.py

@@ -52,13 +52,10 @@ def add_section_break(self):
         return sentinel_sectPr
 
     def clear_content(self):
+        """Remove all content child elements from this <w:body> element.
+
+        Leave the <w:sectPr> element if it is present.
         """
-        Remove all content child elements from this <w:body> element. Leave
-        the <w:sectPr> element if it is present.
-        """
-        if self.sectPr is not None:
-            content_elms = self[:-1]
-        else:
-            content_elms = self[:]
+        content_elms = self[:-1] if self.sectPr is not None else self[:]
         for content_elm in content_elms:
             self.remove(content_elm)

src/docx/oxml/table.py

@@ -327,14 +327,12 @@ def alignment(self, value):
 
     @property
     def autofit(self):
-        """
-        Return |False| if there is a ``<w:tblLayout>`` child with ``w:type``
-        attribute set to ``'fixed'``. Otherwise return |True|.
+        """|False| when there is a `w:tblLayout` child with `@w:type="fixed"`.
+
+        Otherwise |True|.
         """
         tblLayout = self.tblLayout
-        if tblLayout is None:
-            return True
-        return False if tblLayout.type == "fixed" else True
+        return True if tblLayout is None else tblLayout.type != "fixed"
 
     @autofit.setter
     def autofit(self, value):

src/docx/oxml/xmlchemy.py

@@ -482,13 +482,8 @@ def get_or_change_to_child(obj):
 
     @property
     def _prop_name(self):
-        """
-        Calculate property name from tag name, e.g. a:schemeClr -> schemeClr.
-        """
-        if ":" in self._nsptagname:
-            start = self._nsptagname.index(":") + 1
-        else:
-            start = 0
+        """property name computed from tag name, e.g. a:schemeClr -> schemeClr."""
+        start = self._nsptagname.index(":") + 1 if ":" in self._nsptagname else 0
         return self._nsptagname[start:]
 
     @lazyproperty

src/docx/section.py

@@ -383,10 +383,10 @@ def _drop_definition(self):
         self._document_part.drop_rel(rId)
 
     @property
-    def _has_definition(self):
+    def _has_definition(self) -> bool:
         """True if a footer is defined for this section."""
         footerReference = self._sectPr.get_footerReference(self._hdrftr_index)
-        return False if footerReference is None else True
+        return footerReference is not None
 
     @property
     def _prior_headerfooter(self):
@@ -427,10 +427,10 @@ def _drop_definition(self):
         self._document_part.drop_header_part(rId)
 
     @property
-    def _has_definition(self):
+    def _has_definition(self) -> bool:
         """True if a header is explicitly defined for this section."""
         headerReference = self._sectPr.get_headerReference(self._hdrftr_index)
-        return False if headerReference is None else True
+        return headerReference is not None
 
     @property
     def _prior_headerfooter(self):

src/docx/styles/styles.py

@@ -26,10 +26,7 @@ def __contains__(self, name):
         Enables `in` operator on style name.
         """
         internal_name = BabelFish.ui2internal(name)
-        for style in self._element.style_lst:
-            if style.name_val == internal_name:
-                return True
-        return False
+        return any(style.name_val == internal_name for style in self._element.style_lst)
 
     def __getitem__(self, key):
         """

tests/image/test_png.py

@@ -171,7 +171,7 @@ def it_can_construct_from_a_stream(
 
     def it_provides_access_to_the_IHDR_chunk(self, IHDR_fixture):
         chunks, IHDR_chunk_ = IHDR_fixture
-        assert chunks.IHDR == IHDR_chunk_
+        assert IHDR_chunk_ == chunks.IHDR
 
     def it_provides_access_to_the_pHYs_chunk(self, pHYs_fixture):
         chunks, expected_chunk = pHYs_fixture

tests/styles/test_style.py

@@ -516,10 +516,7 @@ def next_get_fixture(self, request):
         style_elm = styles[style_names.index(style_name)]
         next_style_elm = styles[style_names.index(next_style_name)]
         style = _ParagraphStyle(style_elm)
-        if style_name == "H1":
-            next_style = _ParagraphStyle(next_style_elm)
-        else:
-            next_style = style
+        next_style = _ParagraphStyle(next_style_elm) if style_name == "H1" else style
         return style, next_style
 
     @pytest.fixture(