diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-09-29 17:36:00 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-10-04 10:45:48 +0200 |
| commit | 1dfaccfd9129aa4ac24b46f0a9490b19ae59adc0 (patch) | |
| tree | 466311902843db8865967e23bfbcbd5c1859cb04 /mesonbuild/dependencies | |
| parent | 77b5c82d0725eb914aa341a617dd9f418de60910 (diff) | |
| download | meson-1dfaccfd9129aa4ac24b46f0a9490b19ae59adc0.zip meson-1dfaccfd9129aa4ac24b46f0a9490b19ae59adc0.tar.gz meson-1dfaccfd9129aa4ac24b46f0a9490b19ae59adc0.tar.bz2 | |
pathlib: Fix resolve() by overriding it in Python 3.5
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/boost.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/scalapack.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index e622859..14db6a5 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -27,7 +27,7 @@ import textwrap import platform import typing as T from enum import Enum -from pathlib import Path, PurePath +from .._pathlib import Path, PurePath from .. import mlog from .. import mesonlib diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 370fa72..404c279 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -16,7 +16,7 @@ import os import re import functools import typing as T -from pathlib import Path +from .._pathlib import Path from .. import mlog from .. import mesonlib diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index 21f4e71..0d3db39 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -19,7 +19,7 @@ import os import re import shutil import subprocess -from pathlib import Path +from .._pathlib import Path from ..mesonlib import OrderedSet, join_args from .base import ( diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 15055aa..f41abc8 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -14,7 +14,7 @@ # This file contains the detection logic for miscellaneous external dependencies. -from pathlib import Path +from .._pathlib import Path import functools import re import sysconfig diff --git a/mesonbuild/dependencies/scalapack.py b/mesonbuild/dependencies/scalapack.py index 0147e0b..f8b1ee1 100644 --- a/mesonbuild/dependencies/scalapack.py +++ b/mesonbuild/dependencies/scalapack.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from pathlib import Path +from .._pathlib import Path import functools import os import typing as T |