forked from pool/python-pytest-verbose-parametrize
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
|
Index: pytest-verbose-parametrize-1.7.0/pytest_verbose_parametrize.py
|
||
|
|
===================================================================
|
||
|
|
--- pytest-verbose-parametrize-1.7.0.orig/pytest_verbose_parametrize.py
|
||
|
|
+++ pytest-verbose-parametrize-1.7.0/pytest_verbose_parametrize.py
|
||
|
|
@@ -4,14 +4,13 @@ except ImportError:
|
||
|
|
from collections import Iterable
|
||
|
|
except ModuleNotFoundError:
|
||
|
|
from collections import Iterable
|
||
|
|
-from six import string_types, text_type
|
||
|
|
|
||
|
|
|
||
|
|
def _strize_arg(arg):
|
||
|
|
try:
|
||
|
|
s = arg.__name__
|
||
|
|
except AttributeError:
|
||
|
|
- s = text_type(arg)
|
||
|
|
+ s = str(arg)
|
||
|
|
if len(s) > 32:
|
||
|
|
s = s[:29] + '...'
|
||
|
|
return s
|
||
|
|
@@ -34,7 +33,7 @@ def pytest_generate_tests(metafunc):
|
||
|
|
if 'ids' not in markers.kwargs:
|
||
|
|
list_names = []
|
||
|
|
for i, argvalue in enumerate(markers.args[1]):
|
||
|
|
- if (not isinstance(argvalue, Iterable)) or isinstance(argvalue, string_types):
|
||
|
|
+ if (not isinstance(argvalue, Iterable)) or isinstance(argvalue, str):
|
||
|
|
argvalue = (argvalue,)
|
||
|
|
name = '-'.join(_strize_arg(arg) for arg in argvalue)
|
||
|
|
if len(name) > 64:
|