pep8: fixes for latest version of flake8

* Also take care of a pesky warning from pytest when getting style by
  id.

Author: scanny

docx/enum/shape.py

@@ -18,4 +18,5 @@ class WD_INLINE_SHAPE_TYPE(object):
     SMART_ART = 15
     NOT_IMPLEMENTED = -6
 
+
 WD_INLINE_SHAPE = WD_INLINE_SHAPE_TYPE

docx/enum/text.py

@@ -81,6 +81,7 @@ class WD_BREAK_TYPE(object):
     SECTION_ODD_PAGE = 5
     TEXT_WRAPPING = 11
 
+
 WD_BREAK = WD_BREAK_TYPE
 
 

docx/image/png.py

@@ -132,7 +132,7 @@ def IHDR(self):
         """
         IHDR chunk in PNG image
         """
-        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.IHDR
+        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.IHDR  # noqa
         IHDR = self._find_first(match)
         if IHDR is None:
             raise InvalidImageStreamError('no IHDR chunk in PNG image')
@@ -143,7 +143,7 @@ def pHYs(self):
         """
         pHYs chunk in PNG image, or |None| if not present
         """
-        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.pHYs
+        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.pHYs  # noqa
         return self._find_first(match)
 
     def _find_first(self, match):

docx/oxml/__init__.py

@@ -64,19 +64,17 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 # custom element class mappings
 # ===========================================================================
 
-from .shared import CT_DecimalNumber, CT_OnOff, CT_String
+from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
 
 
-from .coreprops import CT_CoreProperties
+from .coreprops import CT_CoreProperties  # noqa
 register_element_cls('cp:coreProperties', CT_CoreProperties)
 
-from .document import CT_Body, CT_Document
+from .document import CT_Body, CT_Document  # noqa
 register_element_cls('w:body',     CT_Body)
 register_element_cls('w:document', CT_Document)
 
-from .numbering import (
-    CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
-)
+from .numbering import CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr  # noqa
 register_element_cls('w:abstractNumId', CT_DecimalNumber)
 register_element_cls('w:ilvl',          CT_DecimalNumber)
 register_element_cls('w:lvlOverride',   CT_NumLvl)
@@ -86,13 +84,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:numbering',     CT_Numbering)
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
-from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType
+from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
 register_element_cls('w:pgMar',  CT_PageMar)
 register_element_cls('w:pgSz',   CT_PageSz)
 register_element_cls('w:sectPr', CT_SectPr)
 register_element_cls('w:type',   CT_SectType)
 
-from .shape import (
+from .shape import (  # noqa
     CT_Blip, CT_BlipFillProperties, CT_GraphicalObject,
     CT_GraphicalObjectData, CT_Inline, CT_NonVisualDrawingProps, CT_Picture,
     CT_PictureNonVisual, CT_Point2D, CT_PositiveSize2D, CT_ShapeProperties,
@@ -113,7 +111,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('wp:extent',     CT_PositiveSize2D)
 register_element_cls('wp:inline',     CT_Inline)
 
-from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles
+from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles  # noqa
 register_element_cls('w:basedOn',        CT_String)
 register_element_cls('w:latentStyles',   CT_LatentStyles)
 register_element_cls('w:locked',         CT_OnOff)
@@ -127,7 +125,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:uiPriority',     CT_DecimalNumber)
 register_element_cls('w:unhideWhenUsed', CT_OnOff)
 
-from .table import (
+from .table import (  # noqa
     CT_Height, CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType,
     CT_TblPr, CT_TblWidth, CT_Tc, CT_TcPr, CT_TrPr, CT_VerticalJc, CT_VMerge
 )
@@ -148,7 +146,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vAlign',     CT_VerticalJc)
 register_element_cls('w:vMerge',     CT_VMerge)
 
-from .text.font import (
+from .text.font import (  # noqa
     CT_Color, CT_Fonts, CT_Highlight, CT_HpsMeasure, CT_RPr, CT_Underline,
     CT_VerticalAlignRun
 )
@@ -181,10 +179,10 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vertAlign',  CT_VerticalAlignRun)
 register_element_cls('w:webHidden',  CT_OnOff)
 
-from .text.paragraph import CT_P
+from .text.paragraph import CT_P  # noqa
 register_element_cls('w:p', CT_P)
 
-from .text.parfmt import (
+from .text.parfmt import (  # noqa
     CT_Ind, CT_Jc, CT_PPr, CT_Spacing, CT_TabStop, CT_TabStops
 )
 register_element_cls('w:ind',             CT_Ind)
@@ -199,7 +197,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:tabs',            CT_TabStops)
 register_element_cls('w:widowControl',    CT_OnOff)
 
-from .text.run import CT_Br, CT_R, CT_Text
+from .text.run import CT_Br, CT_R, CT_Text  # noqa
 register_element_cls('w:br', CT_Br)
 register_element_cls('w:r',  CT_R)
 register_element_cls('w:t',  CT_Text)

docx/oxml/coreprops.py

@@ -237,7 +237,7 @@ def _offset_dt(cls, dt, offset_str):
         td = timedelta(hours=hours, minutes=minutes)
         return dt + td
 
-    _offset_pattern = re.compile('([+-])(\d\d):(\d\d)')
+    _offset_pattern = re.compile(r'([+-])(\d\d):(\d\d)')
 
     @classmethod
     def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):

docx/oxml/xmlchemy.py

@@ -11,11 +11,11 @@
 
 import re
 
-from . import OxmlElement
-from ..compat import Unicode
-from .exceptions import InvalidXmlError
-from .ns import NamespacePrefixedTag, nsmap, qn
-from ..shared import lazyproperty
+from docx.compat import Unicode
+from docx.oxml import OxmlElement
+from docx.oxml.exceptions import InvalidXmlError
+from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
+from docx.shared import lazyproperty
 
 
 def serialize_for_reading(element):
@@ -39,9 +39,7 @@ class XmlString(Unicode):
     #  front      attrs                                     | text
     #                                                     close
 
-    _xml_elm_line_patt = re.compile(
-        '( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$'
-    )
+    _xml_elm_line_patt = re.compile(r'( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$')
 
     def __eq__(self, other):
         lines = self.splitlines()
@@ -473,7 +471,7 @@ def _prop_name(self):
         Calculate property name from tag name, e.g. a:schemeClr -> schemeClr.
         """
         if ':' in self._nsptagname:
-            start = self._nsptagname.index(':')+1
+            start = self._nsptagname.index(':') + 1
         else:
             start = 0
         return self._nsptagname[start:]

features/steps/helpers.py

@@ -10,6 +10,7 @@
 def absjoin(*paths):
     return os.path.abspath(os.path.join(*paths))
 
+
 thisdir = os.path.split(__file__)[0]
 scratch_dir = absjoin(thisdir, '../_scratch')
 

setup.py

@@ -17,6 +17,7 @@ def text_of(relpath):
         text = f.read()
     return text
 
+
 # Read the version from docx.__version__ without importing the package
 # (and thus attempting to import packages it depends on that may not be
 # installed yet)

tests/image/test_helpers.py

@@ -28,8 +28,8 @@ def it_raises_on_unexpected_EOF(self, read_str_fixture):
 
     def it_can_read_a_long(self, read_long_fixture):
         stream_rdr, offset, expected_int = read_long_fixture
-        l = stream_rdr.read_long(offset)
-        assert l == expected_int
+        long_ = stream_rdr.read_long(offset)
+        assert long_ == expected_int
 
     # fixtures -------------------------------------------------------
 

tests/styles/test_styles.py

@@ -43,6 +43,7 @@ def it_can_iterate_over_its_styles(self, iter_fixture):
         assert count == expected_count
         assert StyleFactory_.call_args_list == expected_calls
 
+    @pytest.mark.filterwarnings('ignore::UserWarning')
     def it_can_get_a_style_by_id(self, getitem_id_fixture):
         styles, key, expected_element = getitem_id_fixture
         style = styles[key]