Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog.d/20241027_173835_kurtmckee_fix_fullnames.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Fixed
-----

* Fix a bug in the bundling code that allowed non-Python files to be importable.

Previously, a package containing a PEP 561 ``py.typed`` file
would have an importable submodule named ``{package}.py``.
9 changes: 7 additions & 2 deletions src/sqliteimport/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,20 @@ def bundle(directory: pathlib.Path, database: pathlib.Path) -> None:
print(f"{'* ' if is_package else ' '} {file}")
if (directory / file).is_dir():
continue
fullname = file.parent if file.name == "__init__.py" else file.with_suffix("")
if file.name == "__init__.py":
fullname = str(file.parent)
elif file.suffix == ".py":
fullname = str(file.with_suffix(""))
else:
fullname = ""
is_package = file.name == "__init__.py"
connection.execute(
"""
INSERT INTO code (fullname, path, is_package, source)
VALUES (?, ?, ?, ?);
""",
(
str(fullname).replace("/", ".").replace("\\", "."),
fullname.replace("/", ".").replace("\\", "."),
str(file),
is_package,
(directory / file).read_text(),
Expand Down