Skip to content

Commit f6672c7

Browse files
committed
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
1 parent cef406b commit f6672c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+42
-92
lines changed

meson.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
import sys
18-
from mesonbuild._pathlib import Path
18+
from pathlib import Path
1919

2020
# If we're run uninstalled, add the script directory to sys.path to ensure that
2121
# we always import the correct mesonbuild modules even if PYTHONPATH is mangled

mesonbuild/_pathlib.py

Lines changed: 0 additions & 49 deletions
This file was deleted.

mesonbuild/backend/backends.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from collections import OrderedDict
1616
from functools import lru_cache
17-
from .._pathlib import Path
17+
from pathlib import Path
1818
import enum
1919
import json
2020
import os

mesonbuild/backend/ninjabackend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from collections import OrderedDict
2121
from enum import Enum, unique
2222
import itertools
23-
from .._pathlib import PurePath, Path
23+
from pathlib import PurePath, Path
2424
from functools import lru_cache
2525

2626
from . import backends

mesonbuild/backend/vs2010backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import xml.etree.ElementTree as ET
2020
import uuid
2121
import typing as T
22-
from .._pathlib import Path, PurePath
22+
from pathlib import Path, PurePath
2323

2424
from . import backends
2525
from .. import build

mesonbuild/cmake/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from .. import mlog
2020
from contextlib import contextmanager
2121
from subprocess import Popen, PIPE, TimeoutExpired
22-
from .._pathlib import Path
22+
from pathlib import Path
2323
import typing as T
2424
import json
2525

mesonbuild/cmake/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from ..mesonlib import MesonException
1919
from .. import mlog
20-
from .._pathlib import Path
20+
from pathlib import Path
2121
import typing as T
2222

2323
language_map = {

mesonbuild/cmake/executor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# or an interpreter-based tool.
1717

1818
import subprocess as S
19-
from .._pathlib import Path
19+
from pathlib import Path
2020
from threading import Thread
2121
import typing as T
2222
import re

mesonbuild/cmake/fileapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from .common import CMakeException, CMakeBuildFile, CMakeConfiguration
1616
import typing as T
1717
from .. import mlog
18-
from .._pathlib import Path
18+
from pathlib import Path
1919
import json
2020
import re
2121

mesonbuild/cmake/interpreter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header
2828
from enum import Enum
2929
from functools import lru_cache
30-
from .._pathlib import Path
30+
from pathlib import Path
3131
import typing as T
3232
import re
3333
from os import environ

0 commit comments

Comments
 (0)