Skip to content

Commit

Permalink
Remove terminal.flatten function in favor of collapse from more_ite…
Browse files Browse the repository at this point in the history
…rtools
  • Loading branch information
nicoddemus committed Mar 21, 2018
1 parent f61d052 commit 4e717eb
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions _pytest/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import pluggy
import py
import six
from more_itertools import collapse

import pytest
from _pytest import nodes
Expand Down Expand Up @@ -442,7 +443,7 @@ def pytest_sessionstart(self, session):

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):
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 4e717eb

Please sign in to comment.