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/modules | |
| 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/modules')
| -rw-r--r-- | mesonbuild/modules/fs.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/unstable_external_project.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py index 5ba1e38..85088b7 100644 --- a/mesonbuild/modules/fs.py +++ b/mesonbuild/modules/fs.py @@ -14,7 +14,7 @@ import typing as T import hashlib -from pathlib import Path, PurePath, PureWindowsPath +from .._pathlib import Path, PurePath, PureWindowsPath from .. import mlog from . import ExtensionModule diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 1cb7698..912c9ff 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -13,7 +13,7 @@ # limitations under the License. import os, types -from pathlib import PurePath +from .._pathlib import PurePath from .. import build from .. import dependencies diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index ceabd76..87dfc33 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -17,7 +17,7 @@ import json import shutil import typing as T -from pathlib import Path +from .._pathlib import Path from .. import mesonlib from ..mesonlib import MachineChoice, MesonException from . import ExtensionModule diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index 7bb761f..fdc5cbf 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -13,7 +13,7 @@ # limitations under the License. import os, subprocess, shlex -from pathlib import Path +from .._pathlib import Path import typing as T from . import ExtensionModule, ModuleReturnValue |