Skip to content

Commit e572bd8

Browse files
authored
Stop shadowing the 'format' builtin (#347)
1 parent 5691f90 commit e572bd8

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

pytest_html/extras.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
FORMAT_VIDEO = "video"
1111

1212

13-
def extra(content, format, name=None, mime_type=None, extension=None):
13+
def extra(content, format_type, name=None, mime_type=None, extension=None):
1414
return {
1515
"name": name,
16-
"format": format,
16+
"format_type": format_type,
1717
"content": content,
1818
"mime_type": mime_type,
1919
"extension": extension,

pytest_html/plugin.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,13 @@ def create_asset(
235235

236236
def append_extra_html(self, extra, extra_index, test_index):
237237
href = None
238-
if extra.get("format") == extras.FORMAT_IMAGE:
238+
if extra.get("format_type") == extras.FORMAT_IMAGE:
239239
self._append_image(extra, extra_index, test_index)
240240

241-
elif extra.get("format") == extras.FORMAT_HTML:
241+
elif extra.get("format_type") == extras.FORMAT_HTML:
242242
self.additional_html.append(html.div(raw(extra.get("content"))))
243243

244-
elif extra.get("format") == extras.FORMAT_JSON:
244+
elif extra.get("format_type") == extras.FORMAT_JSON:
245245
content = json.dumps(extra.get("content"))
246246
if self.self_contained:
247247
href = data_uri(content, mime_type=extra.get("mime_type"))
@@ -250,7 +250,7 @@ def append_extra_html(self, extra, extra_index, test_index):
250250
content, extra_index, test_index, extra.get("extension")
251251
)
252252

253-
elif extra.get("format") == extras.FORMAT_TEXT:
253+
elif extra.get("format_type") == extras.FORMAT_TEXT:
254254
content = extra.get("content")
255255
if isinstance(content, bytes):
256256
content = content.decode("utf-8")
@@ -261,17 +261,17 @@ def append_extra_html(self, extra, extra_index, test_index):
261261
content, extra_index, test_index, extra.get("extension")
262262
)
263263

264-
elif extra.get("format") == extras.FORMAT_URL:
264+
elif extra.get("format_type") == extras.FORMAT_URL:
265265
href = extra.get("content")
266266

267-
elif extra.get("format") == extras.FORMAT_VIDEO:
267+
elif extra.get("format_type") == extras.FORMAT_VIDEO:
268268
self._append_video(extra, extra_index, test_index)
269269

270270
if href is not None:
271271
self.links_html.append(
272272
html.a(
273273
extra.get("name"),
274-
class_=extra.get("format"),
274+
class_=extra.get("format_type"),
275275
href=href,
276276
target="_blank",
277277
)

0 commit comments

Comments
 (0)