From 1dfaccfd9129aa4ac24b46f0a9490b19ae59adc0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 29 Sep 2020 17:36:00 +0200 Subject: pathlib: Fix resolve() by overriding it in Python 3.5 --- mesonbuild/compilers/fortran.py | 2 +- mesonbuild/compilers/mixins/clike.py | 2 +- mesonbuild/compilers/mixins/pgi.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/compilers') diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 9f2f106..e85ee6d 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.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 typing as T import subprocess, os diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index dca09ea..3c2c53c 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -28,7 +28,7 @@ import os import re import subprocess import typing as T -from pathlib import Path +from ..._pathlib import Path from ... import arglist from ... import mesonlib diff --git a/mesonbuild/compilers/mixins/pgi.py b/mesonbuild/compilers/mixins/pgi.py index 61dee8d..bc16cac 100644 --- a/mesonbuild/compilers/mixins/pgi.py +++ b/mesonbuild/compilers/mixins/pgi.py @@ -16,7 +16,7 @@ import typing as T import os -from pathlib import Path +from ..._pathlib import Path from ..compilers import clike_debug_args, clike_optimization_args -- cgit v1.1