Skip to content

Commit 2c4c6b5

Browse files
committed
Fix slash & dot. Fix builds
1 parent 968ed26 commit 2c4c6b5

File tree

10 files changed

+12
-13
lines changed

10 files changed

+12
-13
lines changed

ports/atmel-samd/mpconfigport.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ CIRCUITPY_LTO = 1
1313

1414
CIRCUITPY_KEYPAD_DEMUX ?= 0
1515
CIRCUITPY_LVFONTIO ?= 0
16+
CIRCUITPY_PATHLIB ?= 0
1617

1718
######################################################################
1819
# Put samd21-only choices here.
@@ -47,7 +48,6 @@ CIRCUITPY_JSON ?= 0
4748
CIRCUITPY_KEYPAD ?= 0
4849
CIRCUITPY_MSGPACK ?= 0
4950
CIRCUITPY_OS_GETENV ?= 0
50-
CIRCUITPY_PATHLIB ?= 0
5151
CIRCUITPY_PIXELMAP ?= 0
5252
CIRCUITPY_RE ?= 0
5353
CIRCUITPY_SDCARDIO ?= 0
@@ -121,7 +121,6 @@ CIRCUITPY_BITMAPFILTER ?= 0
121121
CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD)
122122
CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
123123
CIRCUITPY_MAX3421E ?= $(HAS_1MB_FLASH)
124-
CIRCUITPY_PATHLIB ?= 0
125124
CIRCUITPY_PS2IO ?= 1
126125
CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
127126
CIRCUITPY_SAMD ?= 1

ports/zephyr-cp/boards/nordic/nrf5340dk/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

ports/zephyr-cp/boards/nordic/nrf54l15dk/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

ports/zephyr-cp/boards/nordic/nrf7002dk/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

ports/zephyr-cp/boards/renesas/ek_ra6m5/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

ports/zephyr-cp/boards/renesas/ek_ra8d1/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

ports/zephyr-cp/boards/st/nucleo_u575zi_q/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

ports/zephyr-cp/boards/st/stm32h7b3i_dk/autogen_board_info.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ nvm = false
7171
onewireio = false
7272
os = true
7373
paralleldisplaybus = false
74+
pathlib = false
7475
ps2io = false
7576
pulseio = false
7677
pwmio = false

shared-bindings/pathlib/__init__.c

+2-9
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,9 @@
1616
//| """Filesystem path operations"""
1717
//|
1818

19-
//| class Path:
19+
//| def Path(path: Union[str, "PosixPath"]) -> "PosixPath":
2020
//| """Factory function that returns a new PosixPath."""
21-
//|
22-
//| def __new__(cls, *args) -> PosixPath:
23-
//| """Create a new Path object.
24-
//|
25-
//| :param args: Path components
26-
//| :return: A new PosixPath object
27-
//| """
28-
//| ...
21+
//| ...
2922
//|
3023

3124
/* Path is just an alias for PosixPath in CircuitPython */

shared-module/pathlib/PosixPath.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ mp_obj_t common_hal_pathlib_posixpath_parent(pathlib_posixpath_obj_t *self) {
119119

120120
// No slash found, return "."
121121
if (last_slash == -1) {
122-
return pathlib_posixpath_from_str(MP_OBJ_NEW_QSTR(MP_QSTR_dot));
122+
return pathlib_posixpath_from_str(MP_OBJ_NEW_QSTR(MP_QSTR__dot_));
123123
}
124124

125125
// Root directory
126126
if (last_slash == 0) {
127-
return pathlib_posixpath_from_str(MP_OBJ_NEW_QSTR(MP_QSTR_slash));
127+
return pathlib_posixpath_from_str(MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
128128
}
129129

130130
// Create parent path

0 commit comments

Comments
 (0)