diff --git a/_pytest/terminal.py b/_pytest/terminal.py index 7dc36e7d7..f8ad33c10 100644 --- a/_pytest/terminal.py +++ b/_pytest/terminal.py @@ -12,6 +12,7 @@ import time import pluggy import py import six +from more_itertools import collapse import pytest from _pytest import nodes @@ -442,7 +443,7 @@ class TerminalReporter(object): def _write_report_lines_from_hooks(self, lines): lines.reverse() - for line in flatten(lines): + for line in collapse(lines): self.write_line(line) def pytest_report_header(self, config): @@ -700,15 +701,6 @@ def repr_pythonversion(v=None): return str(v) -def flatten(values): - for x in values: - if isinstance(x, (list, tuple)): - for y in flatten(x): - yield y - else: - yield x - - def build_summary_stats_line(stats): keys = ("failed passed skipped deselected " "xfailed xpassed warnings error").split() diff --git a/changelog/3330.trivial.rst b/changelog/3330.trivial.rst new file mode 100644 index 000000000..ce5ec5882 --- /dev/null +++ b/changelog/3330.trivial.rst @@ -0,0 +1 @@ +Remove internal ``_pytest.terminal.flatten`` function in favor of ``more_itertools.collapse``.