Skip to content

Commit 7d220f8

Browse files
authored
Remove importing IN_BROWSER from pyodide.ffi (#255)
1 parent 65f4c2f commit 7d220f8

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

micropip/_compat/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
compatibility_layer: type[CompatibilityLayer]
66

7-
IN_BROWSER = "_pyodide_core" in sys.modules
7+
_IN_PYODIDE = "_pyodide_core" in sys.modules
88

9-
if IN_BROWSER:
9+
if _IN_PYODIDE:
1010
from ._compat_in_pyodide import CompatibilityInPyodide
1111

1212
compatibility_layer = CompatibilityInPyodide

micropip/_compat/_compat_in_pyodide.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pathlib import Path
22
from urllib.parse import urlparse
33

4-
from pyodide.ffi import IN_BROWSER, to_js
4+
from pyodide.ffi import to_js
55
from pyodide.http import pyfetch
66

77
from .compatibility_layer import CompatibilityLayer
@@ -16,10 +16,10 @@
1616

1717
LOCKFILE_PACKAGES = pyodide_js._api.lockfile_packages.to_py()
1818
LOCKFILE_INFO = pyodide_js._api.lockfile_info.to_py()
19-
except ImportError:
20-
if IN_BROWSER:
21-
raise
22-
# Otherwise, this is pytest test collection so let it go.
19+
except ImportError as e:
20+
raise ImportError(
21+
"Failed to import pyodide modules, please report this issue to Pyodide team."
22+
) from e
2323

2424

2525
class CompatibilityInPyodide(CompatibilityLayer):

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,6 @@ ignore_missing_imports = true
7474
[[tool.mypy.overrides]]
7575
module = "micropip._vendored.*"
7676
warn_unreachable = false
77+
78+
[tool.pytest.ini_options]
79+
addopts = "--ignore=micropip/_vendored --ignore=micropip/_compat --doctest-modules"

0 commit comments

Comments
 (0)