forked from pool/python-pytest-verbose-parametrize
Steve Kowalik
31f64db3e3
* Drop support for Python 2 and <3.6, removing compatibility code. * Use stdlib unittest.mock instead of mock package. * Removed usage of path.py and path in favour of pathlib. - Removed patches, included upstream: * Iterable-collections.patch * pytest-fixtures-pr171-remove-mock.patch - Refreshed python-pytest-verbose-parametrize-no-six.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-verbose-parametrize?expand=0&rev=14
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
Index: pytest-verbose-parametrize-1.8.0/pytest_verbose_parametrize.py
|
|
===================================================================
|
|
--- pytest-verbose-parametrize-1.8.0.orig/pytest_verbose_parametrize.py
|
|
+++ pytest-verbose-parametrize-1.8.0/pytest_verbose_parametrize.py
|
|
@@ -1,12 +1,11 @@
|
|
from collections.abc 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
|
|
@@ -29,7 +28,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:
|
|
Index: pytest-verbose-parametrize-1.8.0/setup.py
|
|
===================================================================
|
|
--- pytest-verbose-parametrize-1.8.0.orig/setup.py
|
|
+++ pytest-verbose-parametrize-1.8.0/setup.py
|
|
@@ -18,7 +18,6 @@ classifiers = [
|
|
]
|
|
|
|
install_requires = ['pytest',
|
|
- 'six',
|
|
]
|
|
|
|
tests_require = ['mock; python_version<"3.3"',
|