aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-11-20 14:56:29 -0800
committerDylan Baker <dylan@pnwbakers.com>2020-11-20 15:08:40 -0800
commitf6672c7a1923c3e052af3ad223d6075b86378bfc (patch)
tree2f5a00744c247fa37044cb2a584cc6defa68cf50 /mesonbuild/cmake
parentcef406b3a5d502cde58cdad9fc9b978efb413327 (diff)
downloadmeson-f6672c7a1923c3e052af3ad223d6075b86378bfc.zip
meson-f6672c7a1923c3e052af3ad223d6075b86378bfc.tar.gz
meson-f6672c7a1923c3e052af3ad223d6075b86378bfc.tar.bz2
use real pathlib module
We added the _pathlib module to work around defeciencies in python 3.5's implementation, since we now rely on 3.6 lets drop this
Diffstat (limited to 'mesonbuild/cmake')
-rw-r--r--mesonbuild/cmake/client.py2
-rw-r--r--mesonbuild/cmake/common.py2
-rw-r--r--mesonbuild/cmake/executor.py2
-rw-r--r--mesonbuild/cmake/fileapi.py2
-rw-r--r--mesonbuild/cmake/interpreter.py2
-rw-r--r--mesonbuild/cmake/toolchain.py2
-rw-r--r--mesonbuild/cmake/traceparser.py2
7 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/cmake/client.py b/mesonbuild/cmake/client.py
index 8f9456b..eeaab57 100644
--- a/mesonbuild/cmake/client.py
+++ b/mesonbuild/cmake/client.py
@@ -19,7 +19,7 @@ from .common import CMakeException, CMakeConfiguration, CMakeBuildFile
from .. import mlog
from contextlib import contextmanager
from subprocess import Popen, PIPE, TimeoutExpired
-from .._pathlib import Path
+from pathlib import Path
import typing as T
import json
diff --git a/mesonbuild/cmake/common.py b/mesonbuild/cmake/common.py
index 4bcc4d9..0ec1698 100644
--- a/mesonbuild/cmake/common.py
+++ b/mesonbuild/cmake/common.py
@@ -17,7 +17,7 @@
from ..mesonlib import MesonException
from .. import mlog
-from .._pathlib import Path
+from pathlib import Path
import typing as T
language_map = {
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py
index e11dbe9..19971e3 100644
--- a/mesonbuild/cmake/executor.py
+++ b/mesonbuild/cmake/executor.py
@@ -16,7 +16,7 @@
# or an interpreter-based tool.
import subprocess as S
-from .._pathlib import Path
+from pathlib import Path
from threading import Thread
import typing as T
import re
diff --git a/mesonbuild/cmake/fileapi.py b/mesonbuild/cmake/fileapi.py
index 1b6c30d..ce63219 100644
--- a/mesonbuild/cmake/fileapi.py
+++ b/mesonbuild/cmake/fileapi.py
@@ -15,7 +15,7 @@
from .common import CMakeException, CMakeBuildFile, CMakeConfiguration
import typing as T
from .. import mlog
-from .._pathlib import Path
+from pathlib import Path
import json
import re
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index e2f11a0..5797c0d 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -27,7 +27,7 @@ from ..mesondata import mesondata
from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header
from enum import Enum
from functools import lru_cache
-from .._pathlib import Path
+from pathlib import Path
import typing as T
import re
from os import environ
diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py
index 52d1f10..1870445 100644
--- a/mesonbuild/cmake/toolchain.py
+++ b/mesonbuild/cmake/toolchain.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
from ..envconfig import CMakeSkipCompilerTest
from ..mesonlib import MachineChoice
from .common import language_map
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py
index c6f2b9d..613b4b2 100644
--- a/mesonbuild/cmake/traceparser.py
+++ b/mesonbuild/cmake/traceparser.py
@@ -21,7 +21,7 @@ from .. import mlog
from ..mesonlib import version_compare
import typing as T
-from .._pathlib import Path
+from pathlib import Path
import re
import json
import textwrap