aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-11-22 04:28:19 +0200
committerGitHub <noreply@github.com>2020-11-22 04:28:19 +0200
commitd27bad7d6d118cdb5a007d6efd743a8c9d48f683 (patch)
tree9a471cd5d458ed7b559efd6475d56c2bbab5c13a /mesonbuild/modules
parent15bbf1ea7581a8a872296435b28d679c7e42a466 (diff)
parent5c602b5457bba915ad560f141e9c2b8c9ca1e7ec (diff)
downloadmeson-d27bad7d6d118cdb5a007d6efd743a8c9d48f683.zip
meson-d27bad7d6d118cdb5a007d6efd743a8c9d48f683.tar.gz
meson-d27bad7d6d118cdb5a007d6efd743a8c9d48f683.tar.bz2
Merge pull request #8011 from dcbaker/submit/post-python36-cleanups
Python 3.6 cleanups
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/fs.py2
-rw-r--r--mesonbuild/modules/pkgconfig.py2
-rw-r--r--mesonbuild/modules/python.py2
-rw-r--r--mesonbuild/modules/unstable_external_project.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py
index 85088b7..5ba1e38 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 62e1c15..7e19d71 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 bb61475..ff0df2f 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 fdc5cbf..7bb761f 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