Skip to content

Commit 2af62f9

Browse files
committed
fix: move sys import to top-level, drop patch alias in utils
1 parent b322028 commit 2af62f9

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/rpdk/core/data_loaders.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import os
44
import re
55
import shutil
6+
import sys
67
from io import TextIOWrapper
78
from pathlib import Path
89

@@ -41,8 +42,6 @@ def resource_stream(package_name, resource_name, encoding="utf-8"):
4142
Decoding errors raise :exc:`ValueError`. :term:`universal newlines`
4243
are enabled. Can be used in a ``with`` statement.
4344
"""
44-
import sys
45-
4645
pkg = sys.modules[package_name].__spec__.parent or package_name
4746
f = importlib_resources_files(pkg).joinpath(resource_name).open("rb")
4847
return TextIOWrapper(f, encoding=encoding)
@@ -61,8 +60,6 @@ def resource_yaml(package_name, resource_name):
6160

6261

6362
def copy_resource(package_name, resource_name, out_path):
64-
import sys
65-
6663
pkg = sys.modules[package_name].__spec__.parent or package_name
6764
with importlib_resources_files(pkg).joinpath(resource_name).open(
6865
"rb"

tests/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from io import BytesIO
55
from pathlib import Path
66
from random import sample
7-
from unittest.mock import Mock, patch, patch as _patch
7+
from unittest.mock import Mock, patch
88

99
from rpdk.core.project import Project
1010

@@ -76,7 +76,7 @@ def add_dummy_language_plugin():
7676
ep = importlib.metadata.EntryPoint(
7777
name="dummy", value="rpdk.dummy:DummyLanguagePlugin", group="rpdk.v1.languages"
7878
)
79-
_patch(
79+
patch(
8080
"rpdk.core.plugin_registry._iter_entry_points",
8181
side_effect=lambda group: [ep] if group == "rpdk.v1.languages" else [],
8282
).start()

0 commit comments

Comments
 (0)