Skip to content

Commit a13848b

Browse files
Benjamin Toornstrascanny
Benjamin Toornstra
authored and
scanny
committed
pep8: fixes for latest version of flake8
1 parent fff3b0c commit a13848b

18 files changed

Lines changed: 344 additions & 306 deletions

File tree

‎docx/enum/base.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ def _member_def(self, member):
7272
"""
7373
member_docstring = textwrap.dedent(member.docstring).strip()
7474
member_docstring = textwrap.fill(
75-
member_docstring, width=78, initial_indent=' '*4,
76-
subsequent_indent=' '*4
75+
member_docstring, width=78, initial_indent=' ' * 4,
76+
subsequent_indent=' ' * 4
7777
)
7878
return '%s\n%s\n' % (member.name, member_docstring)
7979

@@ -103,7 +103,7 @@ def _page_title(self):
103103
The title for the documentation page, formatted as code (surrounded
104104
in double-backtics) and underlined with '=' characters
105105
"""
106-
title_underscore = '=' * (len(self._clsname)+4)
106+
title_underscore = '=' * (len(self._clsname) + 4)
107107
return '``%s``\n%s' % (self._clsname, title_underscore)
108108

109109

‎docx/image/jpeg.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ def next(self, start):
208208
# skip over any non-\xFF bytes
209209
position = self._offset_of_next_ff_byte(start=position)
210210
# skip over any \xFF padding bytes
211-
position, byte_ = self._next_non_ff_byte(start=position+1)
211+
position, byte_ = self._next_non_ff_byte(start=position + 1)
212212
# 'FF 00' sequence is not a marker, start over if found
213213
if byte_ == b'\x00':
214214
continue
215215
# this is a marker, gather return values and break out of scan
216-
marker_code, segment_offset = byte_, position+1
216+
marker_code, segment_offset = byte_, position + 1
217217
break
218218
return marker_code, segment_offset
219219

@@ -438,7 +438,7 @@ def _is_non_Exif_APP1_segment(cls, stream, offset):
438438
Exif segment, as determined by the ``'Exif\x00\x00'`` signature at
439439
offset 2 in the segment.
440440
"""
441-
stream.seek(offset+2)
441+
stream.seek(offset + 2)
442442
exif_signature = stream.read(6)
443443
return exif_signature != b'Exif\x00\x00'
444444

@@ -449,8 +449,8 @@ def _tiff_from_exif_segment(cls, stream, offset, segment_length):
449449
*segment_length* at *offset* in *stream*.
450450
"""
451451
# wrap full segment in its own stream and feed to Tiff()
452-
stream.seek(offset+8)
453-
segment_bytes = stream.read(segment_length-8)
452+
stream.seek(offset + 8)
453+
segment_bytes = stream.read(segment_length - 8)
454454
substream = BytesIO(segment_bytes)
455455
return Tiff.from_stream(substream)
456456

‎docx/image/tiff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def iter_entries(self):
200200
directory.
201201
"""
202202
for idx in range(self._entry_count):
203-
dir_entry_offset = self._offset + 2 + (idx*12)
203+
dir_entry_offset = self._offset + 2 + (idx * 12)
204204
ifd_entry = _IfdEntryFactory(self._stream_rdr, dir_entry_offset)
205205
yield ifd_entry
206206

@@ -291,7 +291,7 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
291291
The length of the string, including a terminating '\x00' (NUL)
292292
character, is in *value_count*.
293293
"""
294-
return stream_rdr.read_str(value_count-1, value_offset)
294+
return stream_rdr.read_str(value_count - 1, value_offset)
295295

296296

297297
class _ShortIfdEntry(_IfdEntry):

‎docx/opc/rel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def _next_rId(self):
124124
Next available rId in collection, starting from 'rId1' and making use
125125
of any gaps in numbering, e.g. 'rId2' for rIds ['rId1', 'rId3'].
126126
"""
127-
for n in range(1, len(self)+2):
127+
for n in range(1, len(self) + 2):
128128
rId_candidate = 'rId%d' % n # like 'rId19'
129129
if rId_candidate not in self:
130130
return rId_candidate

‎docx/oxml/__init__.py‎

Lines changed: 111 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def register_element_cls(tag, cls):
3535
element with matching *tag*. *tag* is a string of the form
3636
``nspfx:tagroot``, e.g. ``'w:document'``.
3737
"""
38-
nspfx, tagroot = tag.split(':')
38+
nspfx, tagroot = tag.split(":")
3939
namespace = element_class_lookup.get_namespace(nsmap[nspfx])
4040
namespace[tagroot] = cls
4141

@@ -55,36 +55,38 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
5555
nsptag = NamespacePrefixedTag(nsptag_str)
5656
if nsdecls is None:
5757
nsdecls = nsptag.nsmap
58-
return oxml_parser.makeelement(
59-
nsptag.clark_name, attrib=attrs, nsmap=nsdecls
60-
)
58+
return oxml_parser.makeelement(nsptag.clark_name, attrib=attrs, nsmap=nsdecls)
6159

6260

6361
# ===========================================================================
6462
# custom element class mappings
6563
# ===========================================================================
6664

6765
from .shared import CT_DecimalNumber, CT_OnOff, CT_String # noqa
66+
6867
register_element_cls("w:evenAndOddHeaders", CT_OnOff)
6968
register_element_cls("w:titlePg", CT_OnOff)
7069

7170

7271
from .coreprops import CT_CoreProperties # noqa
73-
register_element_cls('cp:coreProperties', CT_CoreProperties)
72+
73+
register_element_cls("cp:coreProperties", CT_CoreProperties)
7474

7575
from .document import CT_Body, CT_Document # noqa
76-
register_element_cls('w:body', CT_Body)
77-
register_element_cls('w:document', CT_Document)
76+
77+
register_element_cls("w:body", CT_Body)
78+
register_element_cls("w:document", CT_Document)
7879

7980
from .numbering import CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr # noqa
80-
register_element_cls('w:abstractNumId', CT_DecimalNumber)
81-
register_element_cls('w:ilvl', CT_DecimalNumber)
82-
register_element_cls('w:lvlOverride', CT_NumLvl)
83-
register_element_cls('w:num', CT_Num)
84-
register_element_cls('w:numId', CT_DecimalNumber)
85-
register_element_cls('w:numPr', CT_NumPr)
86-
register_element_cls('w:numbering', CT_Numbering)
87-
register_element_cls('w:startOverride', CT_DecimalNumber)
81+
82+
register_element_cls("w:abstractNumId", CT_DecimalNumber)
83+
register_element_cls("w:ilvl", CT_DecimalNumber)
84+
register_element_cls("w:lvlOverride", CT_NumLvl)
85+
register_element_cls("w:num", CT_Num)
86+
register_element_cls("w:numId", CT_DecimalNumber)
87+
register_element_cls("w:numPr", CT_NumPr)
88+
register_element_cls("w:numbering", CT_Numbering)
89+
register_element_cls("w:startOverride", CT_DecimalNumber)
8890

8991
from .section import ( # noqa
9092
CT_HdrFtr,
@@ -94,6 +96,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
9496
CT_SectPr,
9597
CT_SectType,
9698
)
99+
97100
register_element_cls("w:footerReference", CT_HdrFtrRef)
98101
register_element_cls("w:ftr", CT_HdrFtr)
99102
register_element_cls("w:hdr", CT_HdrFtr)
@@ -104,6 +107,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
104107
register_element_cls("w:type", CT_SectType)
105108

106109
from .settings import CT_Settings # noqa
110+
107111
register_element_cls("w:settings", CT_Settings)
108112

109113
from .shape import ( # noqa
@@ -120,34 +124,36 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
120124
CT_ShapeProperties,
121125
CT_Transform2D,
122126
)
123-
register_element_cls('a:blip', CT_Blip)
124-
register_element_cls('a:ext', CT_PositiveSize2D)
125-
register_element_cls('a:graphic', CT_GraphicalObject)
126-
register_element_cls('a:graphicData', CT_GraphicalObjectData)
127-
register_element_cls('a:off', CT_Point2D)
128-
register_element_cls('a:xfrm', CT_Transform2D)
129-
register_element_cls('pic:blipFill', CT_BlipFillProperties)
130-
register_element_cls('pic:cNvPr', CT_NonVisualDrawingProps)
131-
register_element_cls('pic:nvPicPr', CT_PictureNonVisual)
132-
register_element_cls('pic:pic', CT_Picture)
133-
register_element_cls('pic:spPr', CT_ShapeProperties)
134-
register_element_cls('wp:docPr', CT_NonVisualDrawingProps)
135-
register_element_cls('wp:extent', CT_PositiveSize2D)
136-
register_element_cls('wp:inline', CT_Inline)
127+
128+
register_element_cls("a:blip", CT_Blip)
129+
register_element_cls("a:ext", CT_PositiveSize2D)
130+
register_element_cls("a:graphic", CT_GraphicalObject)
131+
register_element_cls("a:graphicData", CT_GraphicalObjectData)
132+
register_element_cls("a:off", CT_Point2D)
133+
register_element_cls("a:xfrm", CT_Transform2D)
134+
register_element_cls("pic:blipFill", CT_BlipFillProperties)
135+
register_element_cls("pic:cNvPr", CT_NonVisualDrawingProps)
136+
register_element_cls("pic:nvPicPr", CT_PictureNonVisual)
137+
register_element_cls("pic:pic", CT_Picture)
138+
register_element_cls("pic:spPr", CT_ShapeProperties)
139+
register_element_cls("wp:docPr", CT_NonVisualDrawingProps)
140+
register_element_cls("wp:extent", CT_PositiveSize2D)
141+
register_element_cls("wp:inline", CT_Inline)
137142

138143
from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles # noqa
139-
register_element_cls('w:basedOn', CT_String)
140-
register_element_cls('w:latentStyles', CT_LatentStyles)
141-
register_element_cls('w:locked', CT_OnOff)
142-
register_element_cls('w:lsdException', CT_LsdException)
143-
register_element_cls('w:name', CT_String)
144-
register_element_cls('w:next', CT_String)
145-
register_element_cls('w:qFormat', CT_OnOff)
146-
register_element_cls('w:semiHidden', CT_OnOff)
147-
register_element_cls('w:style', CT_Style)
148-
register_element_cls('w:styles', CT_Styles)
149-
register_element_cls('w:uiPriority', CT_DecimalNumber)
150-
register_element_cls('w:unhideWhenUsed', CT_OnOff)
144+
145+
register_element_cls("w:basedOn", CT_String)
146+
register_element_cls("w:latentStyles", CT_LatentStyles)
147+
register_element_cls("w:locked", CT_OnOff)
148+
register_element_cls("w:lsdException", CT_LsdException)
149+
register_element_cls("w:name", CT_String)
150+
register_element_cls("w:next", CT_String)
151+
register_element_cls("w:qFormat", CT_OnOff)
152+
register_element_cls("w:semiHidden", CT_OnOff)
153+
register_element_cls("w:style", CT_Style)
154+
register_element_cls("w:styles", CT_Styles)
155+
register_element_cls("w:uiPriority", CT_DecimalNumber)
156+
register_element_cls("w:unhideWhenUsed", CT_OnOff)
151157

152158
from .table import ( # noqa
153159
CT_Height,
@@ -164,22 +170,23 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
164170
CT_VMerge,
165171
CT_VerticalJc,
166172
)
167-
register_element_cls('w:bidiVisual', CT_OnOff)
168-
register_element_cls('w:gridCol', CT_TblGridCol)
169-
register_element_cls('w:gridSpan', CT_DecimalNumber)
170-
register_element_cls('w:tbl', CT_Tbl)
171-
register_element_cls('w:tblGrid', CT_TblGrid)
172-
register_element_cls('w:tblLayout', CT_TblLayoutType)
173-
register_element_cls('w:tblPr', CT_TblPr)
174-
register_element_cls('w:tblStyle', CT_String)
175-
register_element_cls('w:tc', CT_Tc)
176-
register_element_cls('w:tcPr', CT_TcPr)
177-
register_element_cls('w:tcW', CT_TblWidth)
178-
register_element_cls('w:tr', CT_Row)
179-
register_element_cls('w:trHeight', CT_Height)
180-
register_element_cls('w:trPr', CT_TrPr)
181-
register_element_cls('w:vAlign', CT_VerticalJc)
182-
register_element_cls('w:vMerge', CT_VMerge)
173+
174+
register_element_cls("w:bidiVisual", CT_OnOff)
175+
register_element_cls("w:gridCol", CT_TblGridCol)
176+
register_element_cls("w:gridSpan", CT_DecimalNumber)
177+
register_element_cls("w:tbl", CT_Tbl)
178+
register_element_cls("w:tblGrid", CT_TblGrid)
179+
register_element_cls("w:tblLayout", CT_TblLayoutType)
180+
register_element_cls("w:tblPr", CT_TblPr)
181+
register_element_cls("w:tblStyle", CT_String)
182+
register_element_cls("w:tc", CT_Tc)
183+
register_element_cls("w:tcPr", CT_TcPr)
184+
register_element_cls("w:tcW", CT_TblWidth)
185+
register_element_cls("w:tr", CT_Row)
186+
register_element_cls("w:trHeight", CT_Height)
187+
register_element_cls("w:trPr", CT_TrPr)
188+
register_element_cls("w:vAlign", CT_VerticalJc)
189+
register_element_cls("w:vMerge", CT_VMerge)
183190

184191
from .text.font import ( # noqa
185192
CT_Color,
@@ -190,37 +197,39 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
190197
CT_Underline,
191198
CT_VerticalAlignRun,
192199
)
193-
register_element_cls('w:b', CT_OnOff)
194-
register_element_cls('w:bCs', CT_OnOff)
195-
register_element_cls('w:caps', CT_OnOff)
196-
register_element_cls('w:color', CT_Color)
197-
register_element_cls('w:cs', CT_OnOff)
198-
register_element_cls('w:dstrike', CT_OnOff)
199-
register_element_cls('w:emboss', CT_OnOff)
200-
register_element_cls('w:highlight', CT_Highlight)
201-
register_element_cls('w:i', CT_OnOff)
202-
register_element_cls('w:iCs', CT_OnOff)
203-
register_element_cls('w:imprint', CT_OnOff)
204-
register_element_cls('w:noProof', CT_OnOff)
205-
register_element_cls('w:oMath', CT_OnOff)
206-
register_element_cls('w:outline', CT_OnOff)
207-
register_element_cls('w:rFonts', CT_Fonts)
208-
register_element_cls('w:rPr', CT_RPr)
209-
register_element_cls('w:rStyle', CT_String)
210-
register_element_cls('w:rtl', CT_OnOff)
211-
register_element_cls('w:shadow', CT_OnOff)
212-
register_element_cls('w:smallCaps', CT_OnOff)
213-
register_element_cls('w:snapToGrid', CT_OnOff)
214-
register_element_cls('w:specVanish', CT_OnOff)
215-
register_element_cls('w:strike', CT_OnOff)
216-
register_element_cls('w:sz', CT_HpsMeasure)
217-
register_element_cls('w:u', CT_Underline)
218-
register_element_cls('w:vanish', CT_OnOff)
219-
register_element_cls('w:vertAlign', CT_VerticalAlignRun)
220-
register_element_cls('w:webHidden', CT_OnOff)
200+
201+
register_element_cls("w:b", CT_OnOff)
202+
register_element_cls("w:bCs", CT_OnOff)
203+
register_element_cls("w:caps", CT_OnOff)
204+
register_element_cls("w:color", CT_Color)
205+
register_element_cls("w:cs", CT_OnOff)
206+
register_element_cls("w:dstrike", CT_OnOff)
207+
register_element_cls("w:emboss", CT_OnOff)
208+
register_element_cls("w:highlight", CT_Highlight)
209+
register_element_cls("w:i", CT_OnOff)
210+
register_element_cls("w:iCs", CT_OnOff)
211+
register_element_cls("w:imprint", CT_OnOff)
212+
register_element_cls("w:noProof", CT_OnOff)
213+
register_element_cls("w:oMath", CT_OnOff)
214+
register_element_cls("w:outline", CT_OnOff)
215+
register_element_cls("w:rFonts", CT_Fonts)
216+
register_element_cls("w:rPr", CT_RPr)
217+
register_element_cls("w:rStyle", CT_String)
218+
register_element_cls("w:rtl", CT_OnOff)
219+
register_element_cls("w:shadow", CT_OnOff)
220+
register_element_cls("w:smallCaps", CT_OnOff)
221+
register_element_cls("w:snapToGrid", CT_OnOff)
222+
register_element_cls("w:specVanish", CT_OnOff)
223+
register_element_cls("w:strike", CT_OnOff)
224+
register_element_cls("w:sz", CT_HpsMeasure)
225+
register_element_cls("w:u", CT_Underline)
226+
register_element_cls("w:vanish", CT_OnOff)
227+
register_element_cls("w:vertAlign", CT_VerticalAlignRun)
228+
register_element_cls("w:webHidden", CT_OnOff)
221229

222230
from .text.paragraph import CT_P # noqa
223-
register_element_cls('w:p', CT_P)
231+
232+
register_element_cls("w:p", CT_P)
224233

225234
from .text.parfmt import ( # noqa
226235
CT_Ind,
@@ -230,19 +239,21 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
230239
CT_TabStop,
231240
CT_TabStops,
232241
)
233-
register_element_cls('w:ind', CT_Ind)
234-
register_element_cls('w:jc', CT_Jc)
235-
register_element_cls('w:keepLines', CT_OnOff)
236-
register_element_cls('w:keepNext', CT_OnOff)
237-
register_element_cls('w:pageBreakBefore', CT_OnOff)
238-
register_element_cls('w:pPr', CT_PPr)
239-
register_element_cls('w:pStyle', CT_String)
240-
register_element_cls('w:spacing', CT_Spacing)
241-
register_element_cls('w:tab', CT_TabStop)
242-
register_element_cls('w:tabs', CT_TabStops)
243-
register_element_cls('w:widowControl', CT_OnOff)
242+
243+
register_element_cls("w:ind", CT_Ind)
244+
register_element_cls("w:jc", CT_Jc)
245+
register_element_cls("w:keepLines", CT_OnOff)
246+
register_element_cls("w:keepNext", CT_OnOff)
247+
register_element_cls("w:pageBreakBefore", CT_OnOff)
248+
register_element_cls("w:pPr", CT_PPr)
249+
register_element_cls("w:pStyle", CT_String)
250+
register_element_cls("w:spacing", CT_Spacing)
251+
register_element_cls("w:tab", CT_TabStop)
252+
register_element_cls("w:tabs", CT_TabStops)
253+
register_element_cls("w:widowControl", CT_OnOff)
244254

245255
from .text.run import CT_Br, CT_R, CT_Text # noqa
246-
register_element_cls('w:br', CT_Br)
247-
register_element_cls('w:r', CT_R)
248-
register_element_cls('w:t', CT_Text)
256+
257+
register_element_cls("w:br", CT_Br)
258+
register_element_cls("w:r", CT_R)
259+
register_element_cls("w:t", CT_Text)

0 commit comments

Comments
 (0)