From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?= Date: Thu, 9 Jan 2020 16:43:52 +0100 Subject: On Python3 use 'pathlib' rather than 'pathlib2' Origin: Debian Last-Update: 2019-09-05 Last-Update: 2019-09-05 --- setup.py | 2 +- src/canmatrix/j1939_decoder.py | 5 ++++- src/canmatrix/tests/test_arxml.py | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) --- python-canmatrix.orig/setup.py +++ python-canmatrix/setup.py @@ -81,7 +81,7 @@ "bitstruct", "click", "future", - "pathlib2", + "pathlib2; python_version < '3'", "typing; python_version < '3.5'", ], extras_require = { --- python-canmatrix.orig/src/canmatrix/j1939_decoder.py +++ python-canmatrix/src/canmatrix/j1939_decoder.py @@ -4,7 +4,10 @@ from builtins import * import attr -import pathlib2 +try: + import pathlib2 +except ImportError: + import pathlib as pathlib2 import canmatrix.formats --- python-canmatrix.orig/src/canmatrix/tests/test_arxml.py +++ python-canmatrix/src/canmatrix/tests/test_arxml.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- import canmatrix.formats.arxml -import pathlib2 +try: + import pathlib2 +except ImportError: + import pathlib as pathlib2 import io import textwrap @@ -31,4 +34,4 @@ def test_min_max(): here = pathlib2.Path(__file__).parent matrix = canmatrix.formats.arxml.load(str(here / "ARXML_min_max.arxml")) - assert matrix["New_CanCluster"].frames[0].signals[0].is_signed == False \ No newline at end of file + assert matrix["New_CanCluster"].frames[0].signals[0].is_signed == False