Skip to content

Commit 6f0b841

Browse files
authored
Rename utils to pvsc_utils to prevent shadowing (#22760)
Closes #22575 Closes #22757
1 parent baea7a1 commit 6f0b841

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

pythonFiles/tests/unittestadapter/expected_discovery_test_output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT License.
33

44
import os
5-
from unittestadapter.utils import TestNodeTypeEnum
5+
from unittestadapter.pvsc_utils import TestNodeTypeEnum
66
from .helpers import TEST_DATA_PATH
77
import pathlib
88

pythonFiles/tests/unittestadapter/test_discovery.py

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

88
import pytest
99
from unittestadapter.discovery import discover_tests
10-
from unittestadapter.utils import TestNodeTypeEnum, parse_unittest_args
10+
from unittestadapter.pvsc_utils import TestNodeTypeEnum, parse_unittest_args
1111

1212
from . import expected_discovery_test_output
1313
from .helpers import TEST_DATA_PATH, is_same_tree

pythonFiles/tests/unittestadapter/test_utils.py

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

88
import pytest
99

10-
from unittestadapter.utils import (
10+
from unittestadapter.pvsc_utils import (
1111
TestNode,
1212
TestNodeTypeEnum,
1313
build_test_tree,

pythonFiles/unittestadapter/discovery.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
from typing_extensions import Literal, NotRequired, TypedDict
1818

1919
# If I use from utils then there will be an import error in test_discovery.py.
20-
from unittestadapter.utils import TestNode, build_test_tree, parse_unittest_args
20+
from unittestadapter.pvsc_utils import (
21+
TestNode,
22+
build_test_tree,
23+
parse_unittest_args,
24+
)
2125

2226
DEFAULT_PORT = 45454
2327

pythonFiles/unittestadapter/execution.py

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

2020
from testing_tools import process_json_util, socket_manager
2121
from typing_extensions import Literal, NotRequired, TypeAlias, TypedDict
22-
from unittestadapter.utils import parse_unittest_args
22+
from unittestadapter.pvsc_utils import parse_unittest_args
2323

2424
ErrorType = Union[
2525
Tuple[Type[BaseException], BaseException, TracebackType], Tuple[None, None, None]

0 commit comments

Comments
 (0)