From 9eaed7745526a210e5eb0b1a655e0f81fae1b381 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 30 Jan 2020 21:17:17 +0100 Subject: [PATCH] pytester: clarify _makefile signature (cherry picked from commit 92d884f9f29584ead68b233f80777b85273d17b8) --- src/_pytest/pytester.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index cfe1b9a6ca5..60088502ee7 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -608,14 +608,14 @@ def chdir(self): """ self.tmpdir.chdir() - def _makefile(self, ext, args, kwargs, encoding="utf-8"): - items = list(kwargs.items()) + def _makefile(self, ext, lines, files, encoding="utf-8"): + items = list(files.items()) def to_text(s): return s.decode(encoding) if isinstance(s, bytes) else str(s) - if args: - source = "\n".join(to_text(x) for x in args) + if lines: + source = "\n".join(to_text(x) for x in lines) basename = self.request.function.__name__ items.insert(0, (basename, source))