p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use pathlib2 up to python3.4 - damn the stdlib

This commit is contained in:
Ronny Pfannschmidt 2018-06-19 19:45:20 +02:00
parent 1226cdab47
commit abbf73ad1a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@ -73,16 +73,18 @@ def main():
environment_marker_support_level = get_environment_marker_support_level()
if environment_marker_support_level >= 2:
install_requires.append('funcsigs;python_version<"3.0"')
install_requires.append('pathlib2;python_version<"3.0"')
install_requires.append('pathlib2;python_version<"3.5"')
install_requires.append('colorama;sys_platform=="win32"')
elif environment_marker_support_level == 1:
extras_require[':python_version<"3.0"'] = ["funcsigs", "pathlib2"]
extras_require[':python_version<"3.0"'] = ["funcsigs"]
extras_require[':python_version<"3.5"'] = ["pathlib2"]
extras_require[':sys_platform=="win32"'] = ["colorama"]
else:
if sys.platform == "win32":
install_requires.append("colorama")
if sys.version_info < (3, 0):
install_requires.append("funcsigs")
if sys.version_info < (3, 5):
install_requires.append("pathlib2")
setup(

9
src/_pytest/compat.py
View File

@ -30,11 +30,8 @@ _PY2 = not _PY3
if _PY3:
from inspect import signature, Parameter as Parameter
from pathlib import Path
else:
from funcsigs import signature, Parameter as Parameter
from pathlib2 import Path
NoneType = type(None)
NOTSET = object()
@ -43,6 +40,12 @@ PY35 = sys.version_info[:2] >= (3, 5)
PY36 = sys.version_info[:2] >= (3, 6)
MODULE_NOT_FOUND_ERROR = "ModuleNotFoundError" if PY36 else "ImportError"
if PY35:
from pathlib import Path
else:
from pathlib2 import Path
if _PY3:
from collections.abc import MutableMapping as MappingMixin # noqa
from collections.abc import Mapping, Sequence # noqa