From 818a7e63dfd5d239270e846cb02b3fd0758f3089 Mon Sep 17 00:00:00 2001 From: Jennifer Taylor Date: Thu, 25 Jul 2019 18:53:28 -0700 Subject: [PATCH] Make nodes package private Now that nodes are imported from the top level, make the nodes directory private. --- libcst/__init__.py | 18 +++++++++--------- libcst/_batched_visitor.py | 2 +- libcst/{nodes => _nodes}/__init__.py | 0 libcst/{nodes => _nodes}/_base.py | 4 ++-- libcst/{nodes => _nodes}/_deep_equals.py | 2 +- libcst/{nodes => _nodes}/_dummy.py | 8 ++++---- libcst/{nodes => _nodes}/_expression.py | 10 +++++----- libcst/{nodes => _nodes}/_internal.py | 2 +- libcst/{nodes => _nodes}/_module.py | 12 ++++++------ libcst/{nodes => _nodes}/_op.py | 6 +++--- libcst/{nodes => _nodes}/_statement.py | 12 ++++++------ libcst/{nodes => _nodes}/_whitespace.py | 6 +++--- libcst/{nodes => _nodes}/tests/__init__.py | 0 libcst/{nodes => _nodes}/tests/base.py | 2 +- libcst/{nodes => _nodes}/tests/test_assert.py | 2 +- libcst/{nodes => _nodes}/tests/test_assign.py | 2 +- libcst/{nodes => _nodes}/tests/test_atom.py | 4 ++-- .../{nodes => _nodes}/tests/test_attribute.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_await.py | 4 ++-- .../{nodes => _nodes}/tests/test_binary_op.py | 4 ++-- .../{nodes => _nodes}/tests/test_boolean_op.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_call.py | 4 ++-- .../{nodes => _nodes}/tests/test_classdef.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_comment.py | 2 +- .../{nodes => _nodes}/tests/test_comparison.py | 4 ++-- .../{nodes => _nodes}/tests/test_cst_node.py | 0 libcst/{nodes => _nodes}/tests/test_del.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_dict.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_else.py | 4 ++-- .../{nodes => _nodes}/tests/test_empty_line.py | 2 +- libcst/{nodes => _nodes}/tests/test_for.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_funcdef.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_global.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_if.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_ifexp.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_import.py | 4 ++-- .../tests/test_indented_block.py | 2 +- .../{nodes => _nodes}/tests/test_internal.py | 10 +++++----- libcst/{nodes => _nodes}/tests/test_lambda.py | 4 ++-- .../tests/test_leaf_small_statements.py | 2 +- libcst/{nodes => _nodes}/tests/test_list.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_module.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_newline.py | 2 +- .../{nodes => _nodes}/tests/test_nonlocal.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_number.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_raise.py | 4 ++-- .../tests/test_removal_behavior.py | 2 +- libcst/{nodes => _nodes}/tests/test_return.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_set.py | 2 +- .../tests/test_simple_comp.py | 4 ++-- .../tests/test_simple_statement.py | 4 ++-- .../tests/test_simple_whitespace.py | 2 +- .../tests/test_small_statement.py | 4 ++-- .../{nodes => _nodes}/tests/test_subscript.py | 4 ++-- .../tests/test_trailing_whitespace.py | 2 +- libcst/{nodes => _nodes}/tests/test_try.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_tuple.py | 4 ++-- .../{nodes => _nodes}/tests/test_unary_op.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_while.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_with.py | 4 ++-- libcst/{nodes => _nodes}/tests/test_yield.py | 4 ++-- libcst/_visitors.py | 2 +- libcst/metadata/_interface.py | 2 +- libcst/metadata/base_provider.py | 2 +- libcst/metadata/position_provider.py | 4 ++-- libcst/metadata/runner.py | 2 +- .../metadata/tests/test_position_provider.py | 2 +- libcst/parser/_conversions/dummy.py | 4 ++-- libcst/parser/_conversions/expression.py | 2 +- libcst/parser/_conversions/module.py | 2 +- libcst/parser/_detect_config.py | 2 +- libcst/parser/_types/config.py | 2 +- libcst/parser/_whitespace_parser.py | 2 +- libcst/parser/tests/test_footer_behavior.py | 2 +- libcst/parser/tests/test_whitespace_parser.py | 2 +- libcst/tool.py | 2 +- 76 files changed, 143 insertions(+), 143 deletions(-) rename libcst/{nodes => _nodes}/__init__.py (100%) rename libcst/{nodes => _nodes}/_base.py (98%) rename libcst/{nodes => _nodes}/_deep_equals.py (97%) rename libcst/{nodes => _nodes}/_dummy.py (89%) rename libcst/{nodes => _nodes}/_expression.py (99%) rename libcst/{nodes => _nodes}/_internal.py (99%) rename libcst/{nodes => _nodes}/_module.py (95%) rename libcst/{nodes => _nodes}/_op.py (98%) rename libcst/{nodes => _nodes}/_statement.py (99%) rename libcst/{nodes => _nodes}/_whitespace.py (98%) rename libcst/{nodes => _nodes}/tests/__init__.py (100%) rename libcst/{nodes => _nodes}/tests/base.py (99%) rename libcst/{nodes => _nodes}/tests/test_assert.py (99%) rename libcst/{nodes => _nodes}/tests/test_assign.py (99%) rename libcst/{nodes => _nodes}/tests/test_atom.py (99%) rename libcst/{nodes => _nodes}/tests/test_attribute.py (96%) rename libcst/{nodes => _nodes}/tests/test_await.py (96%) rename libcst/{nodes => _nodes}/tests/test_binary_op.py (98%) rename libcst/{nodes => _nodes}/tests/test_boolean_op.py (97%) rename libcst/{nodes => _nodes}/tests/test_call.py (99%) rename libcst/{nodes => _nodes}/tests/test_classdef.py (99%) rename libcst/{nodes => _nodes}/tests/test_comment.py (95%) rename libcst/{nodes => _nodes}/tests/test_comparison.py (99%) rename libcst/{nodes => _nodes}/tests/test_cst_node.py (100%) rename libcst/{nodes => _nodes}/tests/test_del.py (95%) rename libcst/{nodes => _nodes}/tests/test_dict.py (98%) rename libcst/{nodes => _nodes}/tests/test_else.py (90%) rename libcst/{nodes => _nodes}/tests/test_empty_line.py (94%) rename libcst/{nodes => _nodes}/tests/test_for.py (98%) rename libcst/{nodes => _nodes}/tests/test_funcdef.py (99%) rename libcst/{nodes => _nodes}/tests/test_global.py (98%) rename libcst/{nodes => _nodes}/tests/test_if.py (97%) rename libcst/{nodes => _nodes}/tests/test_ifexp.py (97%) rename libcst/{nodes => _nodes}/tests/test_import.py (99%) rename libcst/{nodes => _nodes}/tests/test_indented_block.py (99%) rename libcst/{nodes => _nodes}/tests/test_internal.py (98%) rename libcst/{nodes => _nodes}/tests/test_lambda.py (99%) rename libcst/{nodes => _nodes}/tests/test_leaf_small_statements.py (91%) rename libcst/{nodes => _nodes}/tests/test_list.py (97%) rename libcst/{nodes => _nodes}/tests/test_module.py (98%) rename libcst/{nodes => _nodes}/tests/test_newline.py (95%) rename libcst/{nodes => _nodes}/tests/test_nonlocal.py (98%) rename libcst/{nodes => _nodes}/tests/test_number.py (97%) rename libcst/{nodes => _nodes}/tests/test_raise.py (98%) rename libcst/{nodes => _nodes}/tests/test_removal_behavior.py (98%) rename libcst/{nodes => _nodes}/tests/test_return.py (97%) rename libcst/{nodes => _nodes}/tests/test_set.py (98%) rename libcst/{nodes => _nodes}/tests/test_simple_comp.py (99%) rename libcst/{nodes => _nodes}/tests/test_simple_statement.py (99%) rename libcst/{nodes => _nodes}/tests/test_simple_whitespace.py (98%) rename libcst/{nodes => _nodes}/tests/test_small_statement.py (96%) rename libcst/{nodes => _nodes}/tests/test_subscript.py (99%) rename libcst/{nodes => _nodes}/tests/test_trailing_whitespace.py (95%) rename libcst/{nodes => _nodes}/tests/test_try.py (99%) rename libcst/{nodes => _nodes}/tests/test_tuple.py (99%) rename libcst/{nodes => _nodes}/tests/test_unary_op.py (97%) rename libcst/{nodes => _nodes}/tests/test_while.py (97%) rename libcst/{nodes => _nodes}/tests/test_with.py (98%) rename libcst/{nodes => _nodes}/tests/test_yield.py (98%) diff --git a/libcst/__init__.py b/libcst/__init__.py index df656364..eec066f7 100644 --- a/libcst/__init__.py +++ b/libcst/__init__.py @@ -8,10 +8,8 @@ from libcst._batched_visitor import BatchableCSTVisitor, visit_batched from libcst._exceptions import MetadataException, ParserSyntaxError from libcst._helpers import ensure_type from libcst._maybe_sentinel import MaybeSentinel -from libcst._removal_sentinel import RemovalSentinel -from libcst._visitors import CSTNodeT, CSTTransformer, CSTVisitor, CSTVisitorT -from libcst.nodes._base import CSTNode, CSTValidationError -from libcst.nodes._expression import ( +from libcst._nodes._base import CSTNode, CSTValidationError +from libcst._nodes._expression import ( Annotation, Arg, Asynchronous, @@ -75,9 +73,9 @@ from libcst.nodes._expression import ( UnaryOperation, Yield, ) -from libcst.nodes._internal import CodePosition, CodeRange -from libcst.nodes._module import Module -from libcst.nodes._op import ( +from libcst._nodes._internal import CodePosition, CodeRange +from libcst._nodes._module import Module +from libcst._nodes._op import ( Add, AddAssign, And, @@ -132,7 +130,7 @@ from libcst.nodes._op import ( Subtract, SubtractAssign, ) -from libcst.nodes._statement import ( +from libcst._nodes._statement import ( AnnAssign, AsName, Assert, @@ -171,7 +169,7 @@ from libcst.nodes._statement import ( With, WithItem, ) -from libcst.nodes._whitespace import ( +from libcst._nodes._whitespace import ( Comment, EmptyLine, Newline, @@ -179,6 +177,8 @@ from libcst.nodes._whitespace import ( SimpleWhitespace, TrailingWhitespace, ) +from libcst._removal_sentinel import RemovalSentinel +from libcst._visitors import CSTNodeT, CSTTransformer, CSTVisitor, CSTVisitorT __all__ = [ diff --git a/libcst/_batched_visitor.py b/libcst/_batched_visitor.py index 9bf8891e..b7aa9a79 100644 --- a/libcst/_batched_visitor.py +++ b/libcst/_batched_visitor.py @@ -24,7 +24,7 @@ from libcst.metadata._interface import _MetadataInterface if TYPE_CHECKING: - from libcst.nodes._base import CSTNode # noqa: F401 + from libcst._nodes._base import CSTNode # noqa: F401 from libcst.metadata.base_provider import BaseMetadataProvider # noqa: F401 diff --git a/libcst/nodes/__init__.py b/libcst/_nodes/__init__.py similarity index 100% rename from libcst/nodes/__init__.py rename to libcst/_nodes/__init__.py diff --git a/libcst/nodes/_base.py b/libcst/_nodes/_base.py similarity index 98% rename from libcst/nodes/_base.py rename to libcst/_nodes/_base.py index a9b4c1cb..984ac7ae 100644 --- a/libcst/nodes/_base.py +++ b/libcst/_nodes/_base.py @@ -19,10 +19,10 @@ from typing import ( ) from libcst._exceptions import MetadataException +from libcst._nodes._internal import CodegenState, CodePosition, CodeRange from libcst._removal_sentinel import RemovalSentinel from libcst._type_enforce import is_value_of_type from libcst._visitors import CSTTransformer, CSTVisitor, CSTVisitorT -from libcst.nodes._internal import CodegenState, CodePosition, CodeRange if TYPE_CHECKING: @@ -324,7 +324,7 @@ class CSTNode(ABC): Recursively inspects the entire tree under `self` and `other` to determine if the two trees are equal by value. """ - from libcst.nodes._deep_equals import deep_equals as deep_equals_impl + from libcst._nodes._deep_equals import deep_equals as deep_equals_impl return deep_equals_impl(self, other) diff --git a/libcst/nodes/_deep_equals.py b/libcst/_nodes/_deep_equals.py similarity index 97% rename from libcst/nodes/_deep_equals.py rename to libcst/_nodes/_deep_equals.py index 360bbe68..ce12ad00 100644 --- a/libcst/nodes/_deep_equals.py +++ b/libcst/_nodes/_deep_equals.py @@ -11,7 +11,7 @@ Provides the implementation of `CSTNode.deep_equals`. from dataclasses import fields from typing import Sequence -from libcst.nodes._base import CSTNode +from libcst._nodes._base import CSTNode def deep_equals(a: object, b: object) -> bool: diff --git a/libcst/nodes/_dummy.py b/libcst/_nodes/_dummy.py similarity index 89% rename from libcst/nodes/_dummy.py rename to libcst/_nodes/_dummy.py index a266d583..db811f19 100644 --- a/libcst/nodes/_dummy.py +++ b/libcst/_nodes/_dummy.py @@ -9,12 +9,12 @@ from dataclasses import dataclass from typing import Any, List, Sequence, Union from libcst._add_slots import add_slots +from libcst._nodes._base import CSTNode, CSTValidationError +from libcst._nodes._expression import LeftParen, RightParen +from libcst._nodes._internal import CodegenState, visit_sequence +from libcst._nodes._whitespace import EmptyLine, TrailingWhitespace # noqa: F401 from libcst._removal_sentinel import RemovalSentinel from libcst._visitors import CSTVisitorT -from libcst.nodes._base import CSTNode, CSTValidationError -from libcst.nodes._expression import LeftParen, RightParen -from libcst.nodes._internal import CodegenState, visit_sequence -from libcst.nodes._whitespace import EmptyLine, TrailingWhitespace # noqa: F401 @add_slots diff --git a/libcst/nodes/_expression.py b/libcst/_nodes/_expression.py similarity index 99% rename from libcst/nodes/_expression.py rename to libcst/_nodes/_expression.py index 833f895c..7f3e0280 100644 --- a/libcst/nodes/_expression.py +++ b/libcst/_nodes/_expression.py @@ -21,21 +21,20 @@ from typing_extensions import Literal from libcst._add_slots import add_slots from libcst._maybe_sentinel import MaybeSentinel -from libcst._visitors import CSTVisitorT -from libcst.nodes._base import ( +from libcst._nodes._base import ( AnnotationIndicatorSentinel, CSTCodegenError, CSTNode, CSTValidationError, ) -from libcst.nodes._internal import ( +from libcst._nodes._internal import ( CodegenState, visit_optional, visit_required, visit_sentinel, visit_sequence, ) -from libcst.nodes._op import ( +from libcst._nodes._op import ( AssignEqual, BaseBinaryOp, BaseBooleanOp, @@ -50,7 +49,8 @@ from libcst.nodes._op import ( Not, NotIn, ) -from libcst.nodes._whitespace import BaseParenthesizableWhitespace, SimpleWhitespace +from libcst._nodes._whitespace import BaseParenthesizableWhitespace, SimpleWhitespace +from libcst._visitors import CSTVisitorT @add_slots diff --git a/libcst/nodes/_internal.py b/libcst/_nodes/_internal.py similarity index 99% rename from libcst/nodes/_internal.py rename to libcst/_nodes/_internal.py index 2f55c945..9e87b088 100644 --- a/libcst/nodes/_internal.py +++ b/libcst/_nodes/_internal.py @@ -29,7 +29,7 @@ from libcst._removal_sentinel import RemovalSentinel if TYPE_CHECKING: # These are circular dependencies only used for typing purposes - from libcst.nodes._base import CSTNode # noqa: F401 + from libcst._nodes._base import CSTNode # noqa: F401 from libcst._visitors import CSTVisitorT from libcst.metadata.position_provider import ( # noqa: F401 BasicPositionProvider, diff --git a/libcst/nodes/_module.py b/libcst/_nodes/_module.py similarity index 95% rename from libcst/nodes/_module.py rename to libcst/_nodes/_module.py index c03b17b6..f1cb81de 100644 --- a/libcst/nodes/_module.py +++ b/libcst/_nodes/_module.py @@ -7,17 +7,17 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, Optional, Sequence, Type, TypeVar, Union from libcst._add_slots import add_slots -from libcst._removal_sentinel import RemovalSentinel -from libcst._visitors import CSTVisitorT -from libcst.nodes._base import CSTNode -from libcst.nodes._internal import ( +from libcst._nodes._base import CSTNode +from libcst._nodes._internal import ( CodegenState, SyntacticCodegenState, visit_body_sequence, visit_sequence, ) -from libcst.nodes._statement import BaseCompoundStatement, SimpleStatementLine -from libcst.nodes._whitespace import EmptyLine +from libcst._nodes._statement import BaseCompoundStatement, SimpleStatementLine +from libcst._nodes._whitespace import EmptyLine +from libcst._removal_sentinel import RemovalSentinel +from libcst._visitors import CSTVisitorT if TYPE_CHECKING: diff --git a/libcst/nodes/_op.py b/libcst/_nodes/_op.py similarity index 98% rename from libcst/nodes/_op.py rename to libcst/_nodes/_op.py index 6ca9a61b..dd1041e7 100644 --- a/libcst/nodes/_op.py +++ b/libcst/_nodes/_op.py @@ -9,10 +9,10 @@ from dataclasses import dataclass from typing import Tuple from libcst._add_slots import add_slots +from libcst._nodes._base import BaseLeaf, CSTNode, CSTValidationError +from libcst._nodes._internal import CodegenState, visit_required +from libcst._nodes._whitespace import BaseParenthesizableWhitespace, SimpleWhitespace from libcst._visitors import CSTVisitorT -from libcst.nodes._base import BaseLeaf, CSTNode, CSTValidationError -from libcst.nodes._internal import CodegenState, visit_required -from libcst.nodes._whitespace import BaseParenthesizableWhitespace, SimpleWhitespace class _BaseOneTokenOp(CSTNode, ABC): diff --git a/libcst/nodes/_statement.py b/libcst/_nodes/_statement.py similarity index 99% rename from libcst/nodes/_statement.py rename to libcst/_nodes/_statement.py index a34b6e79..223edda5 100644 --- a/libcst/nodes/_statement.py +++ b/libcst/_nodes/_statement.py @@ -10,9 +10,8 @@ from typing import Optional, Sequence, Union from libcst._add_slots import add_slots from libcst._maybe_sentinel import MaybeSentinel -from libcst._visitors import CSTVisitorT -from libcst.nodes._base import CSTNode, CSTValidationError -from libcst.nodes._expression import ( +from libcst._nodes._base import CSTNode, CSTValidationError +from libcst._nodes._expression import ( Annotation, Arg, Asynchronous, @@ -29,7 +28,7 @@ from libcst.nodes._expression import ( Parameters, RightParen, ) -from libcst.nodes._internal import ( +from libcst._nodes._internal import ( CodegenState, visit_body_sequence, visit_optional, @@ -37,13 +36,14 @@ from libcst.nodes._internal import ( visit_sentinel, visit_sequence, ) -from libcst.nodes._op import AssignEqual, BaseAugOp, Comma, Dot, ImportStar, Semicolon -from libcst.nodes._whitespace import ( +from libcst._nodes._op import AssignEqual, BaseAugOp, Comma, Dot, ImportStar, Semicolon +from libcst._nodes._whitespace import ( BaseParenthesizableWhitespace, EmptyLine, SimpleWhitespace, TrailingWhitespace, ) +from libcst._visitors import CSTVisitorT _INDENT_WHITESPACE_RE = re.compile(r"[ \f\t]+", re.UNICODE) diff --git a/libcst/nodes/_whitespace.py b/libcst/_nodes/_whitespace.py similarity index 98% rename from libcst/nodes/_whitespace.py rename to libcst/_nodes/_whitespace.py index 73f2a405..e224dd74 100644 --- a/libcst/nodes/_whitespace.py +++ b/libcst/_nodes/_whitespace.py @@ -11,14 +11,14 @@ from dataclasses import dataclass from typing import Optional, Pattern, Sequence from libcst._add_slots import add_slots -from libcst._visitors import CSTVisitorT -from libcst.nodes._base import BaseLeaf, BaseValueToken, CSTNode, CSTValidationError -from libcst.nodes._internal import ( +from libcst._nodes._base import BaseLeaf, BaseValueToken, CSTNode, CSTValidationError +from libcst._nodes._internal import ( CodegenState, visit_optional, visit_required, visit_sequence, ) +from libcst._visitors import CSTVisitorT # SimpleWhitespace includes continuation characters, which must be followed immediately diff --git a/libcst/nodes/tests/__init__.py b/libcst/_nodes/tests/__init__.py similarity index 100% rename from libcst/nodes/tests/__init__.py rename to libcst/_nodes/tests/__init__.py diff --git a/libcst/nodes/tests/base.py b/libcst/_nodes/tests/base.py similarity index 99% rename from libcst/nodes/tests/base.py rename to libcst/_nodes/tests/base.py index 2a63be71..269033b9 100644 --- a/libcst/nodes/tests/base.py +++ b/libcst/_nodes/tests/base.py @@ -11,9 +11,9 @@ from typing import Any, Callable, Iterable, List, Optional, Sequence, Type, Type from unittest.mock import patch import libcst as cst +from libcst._nodes._internal import CodegenState, CodeRange, visit_required from libcst._visitors import CSTTransformer, CSTVisitorT from libcst.metadata.position_provider import SyntacticPositionProvider -from libcst.nodes._internal import CodegenState, CodeRange, visit_required from libcst.testing.utils import UnitTest diff --git a/libcst/nodes/tests/test_assert.py b/libcst/_nodes/tests/test_assert.py similarity index 99% rename from libcst/nodes/tests/test_assert.py rename to libcst/_nodes/tests/test_assert.py index 42582e13..b1210c06 100644 --- a/libcst/nodes/tests/test_assert.py +++ b/libcst/_nodes/tests/test_assert.py @@ -9,7 +9,7 @@ from typing import Any import libcst as cst from libcst._helpers import ensure_type -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_assign.py b/libcst/_nodes/tests/test_assign.py similarity index 99% rename from libcst/nodes/tests/test_assign.py rename to libcst/_nodes/tests/test_assign.py index aa25defe..54d8481e 100644 --- a/libcst/nodes/tests/test_assign.py +++ b/libcst/_nodes/tests/test_assign.py @@ -7,7 +7,7 @@ from typing import Any import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_atom.py b/libcst/_nodes/tests/test_atom.py similarity index 99% rename from libcst/nodes/tests/test_atom.py rename to libcst/_nodes/tests/test_atom.py index 9aeeeb7b..6bdaa867 100644 --- a/libcst/nodes/tests/test_atom.py +++ b/libcst/_nodes/tests/test_atom.py @@ -8,8 +8,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_attribute.py b/libcst/_nodes/tests/test_attribute.py similarity index 96% rename from libcst/nodes/tests/test_attribute.py rename to libcst/_nodes/tests/test_attribute.py index a10bcaf5..b5d230b8 100644 --- a/libcst/nodes/tests/test_attribute.py +++ b/libcst/_nodes/tests/test_attribute.py @@ -7,8 +7,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_await.py b/libcst/_nodes/tests/test_await.py similarity index 96% rename from libcst/nodes/tests/test_await.py rename to libcst/_nodes/tests/test_await.py index 67b10446..a4ffb88f 100644 --- a/libcst/nodes/tests/test_await.py +++ b/libcst/_nodes/tests/test_await.py @@ -7,8 +7,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_binary_op.py b/libcst/_nodes/tests/test_binary_op.py similarity index 98% rename from libcst/nodes/tests/test_binary_op.py rename to libcst/_nodes/tests/test_binary_op.py index 2ce4946d..46d358e7 100644 --- a/libcst/nodes/tests/test_binary_op.py +++ b/libcst/_nodes/tests/test_binary_op.py @@ -7,8 +7,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_boolean_op.py b/libcst/_nodes/tests/test_boolean_op.py similarity index 97% rename from libcst/nodes/tests/test_boolean_op.py rename to libcst/_nodes/tests/test_boolean_op.py index 0c15a5f7..7385b359 100644 --- a/libcst/nodes/tests/test_boolean_op.py +++ b/libcst/_nodes/tests/test_boolean_op.py @@ -7,8 +7,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_call.py b/libcst/_nodes/tests/test_call.py similarity index 99% rename from libcst/nodes/tests/test_call.py rename to libcst/_nodes/tests/test_call.py index c70b0093..71cd1bb6 100644 --- a/libcst/nodes/tests/test_call.py +++ b/libcst/_nodes/tests/test_call.py @@ -7,8 +7,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_classdef.py b/libcst/_nodes/tests/test_classdef.py similarity index 99% rename from libcst/nodes/tests/test_classdef.py rename to libcst/_nodes/tests/test_classdef.py index a57feed1..a1104a5f 100644 --- a/libcst/nodes/tests/test_classdef.py +++ b/libcst/_nodes/tests/test_classdef.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_comment.py b/libcst/_nodes/tests/test_comment.py similarity index 95% rename from libcst/nodes/tests/test_comment.py rename to libcst/_nodes/tests/test_comment.py index 4293094d..46b892b5 100644 --- a/libcst/nodes/tests/test_comment.py +++ b/libcst/_nodes/tests/test_comment.py @@ -7,7 +7,7 @@ from typing import Callable import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_comparison.py b/libcst/_nodes/tests/test_comparison.py similarity index 99% rename from libcst/nodes/tests/test_comparison.py rename to libcst/_nodes/tests/test_comparison.py index f6ed49ff..fc3f66af 100644 --- a/libcst/nodes/tests/test_comparison.py +++ b/libcst/_nodes/tests/test_comparison.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_cst_node.py b/libcst/_nodes/tests/test_cst_node.py similarity index 100% rename from libcst/nodes/tests/test_cst_node.py rename to libcst/_nodes/tests/test_cst_node.py diff --git a/libcst/nodes/tests/test_del.py b/libcst/_nodes/tests/test_del.py similarity index 95% rename from libcst/nodes/tests/test_del.py rename to libcst/_nodes/tests/test_del.py index 4649ccfe..e69b43a1 100644 --- a/libcst/nodes/tests/test_del.py +++ b/libcst/_nodes/tests/test_del.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_dict.py b/libcst/_nodes/tests/test_dict.py similarity index 98% rename from libcst/nodes/tests/test_dict.py rename to libcst/_nodes/tests/test_dict.py index 051cdfa3..0a9ba7e9 100644 --- a/libcst/nodes/tests/test_dict.py +++ b/libcst/_nodes/tests/test_dict.py @@ -7,8 +7,8 @@ from typing import Any import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_else.py b/libcst/_nodes/tests/test_else.py similarity index 90% rename from libcst/nodes/tests/test_else.py rename to libcst/_nodes/tests/test_else.py index 90a58fe3..c25e3c8e 100644 --- a/libcst/nodes/tests/test_else.py +++ b/libcst/_nodes/tests/test_else.py @@ -7,8 +7,8 @@ from typing import Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_empty_line.py b/libcst/_nodes/tests/test_empty_line.py similarity index 94% rename from libcst/nodes/tests/test_empty_line.py rename to libcst/_nodes/tests/test_empty_line.py index 212c467f..b9b06852 100644 --- a/libcst/nodes/tests/test_empty_line.py +++ b/libcst/_nodes/tests/test_empty_line.py @@ -5,7 +5,7 @@ # pyre-strict import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_for.py b/libcst/_nodes/tests/test_for.py similarity index 98% rename from libcst/nodes/tests/test_for.py rename to libcst/_nodes/tests/test_for.py index 05476305..de343087 100644 --- a/libcst/nodes/tests/test_for.py +++ b/libcst/_nodes/tests/test_for.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_funcdef.py b/libcst/_nodes/tests/test_funcdef.py similarity index 99% rename from libcst/nodes/tests/test_funcdef.py rename to libcst/_nodes/tests/test_funcdef.py index 316af812..736dc91a 100644 --- a/libcst/nodes/tests/test_funcdef.py +++ b/libcst/_nodes/tests/test_funcdef.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_global.py b/libcst/_nodes/tests/test_global.py similarity index 98% rename from libcst/nodes/tests/test_global.py rename to libcst/_nodes/tests/test_global.py index 64e7b7cd..07a6596e 100644 --- a/libcst/nodes/tests/test_global.py +++ b/libcst/_nodes/tests/test_global.py @@ -8,8 +8,8 @@ from typing import Callable, Optional import libcst as cst from libcst._helpers import ensure_type -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_if.py b/libcst/_nodes/tests/test_if.py similarity index 97% rename from libcst/nodes/tests/test_if.py rename to libcst/_nodes/tests/test_if.py index 2ae3f1e9..e415c92c 100644 --- a/libcst/nodes/tests/test_if.py +++ b/libcst/_nodes/tests/test_if.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_ifexp.py b/libcst/_nodes/tests/test_ifexp.py similarity index 97% rename from libcst/nodes/tests/test_ifexp.py rename to libcst/_nodes/tests/test_ifexp.py index 84d0ac93..6945bd5b 100644 --- a/libcst/nodes/tests/test_ifexp.py +++ b/libcst/_nodes/tests/test_ifexp.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_import.py b/libcst/_nodes/tests/test_import.py similarity index 99% rename from libcst/nodes/tests/test_import.py rename to libcst/_nodes/tests/test_import.py index 68edab18..3e0b6da7 100644 --- a/libcst/nodes/tests/test_import.py +++ b/libcst/_nodes/tests/test_import.py @@ -8,8 +8,8 @@ from typing import Callable, Optional import libcst as cst from libcst._helpers import ensure_type -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_indented_block.py b/libcst/_nodes/tests/test_indented_block.py similarity index 99% rename from libcst/nodes/tests/test_indented_block.py rename to libcst/_nodes/tests/test_indented_block.py index dc92f306..b4bc475d 100644 --- a/libcst/nodes/tests/test_indented_block.py +++ b/libcst/_nodes/tests/test_indented_block.py @@ -7,7 +7,7 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_internal.py b/libcst/_nodes/tests/test_internal.py similarity index 98% rename from libcst/nodes/tests/test_internal.py rename to libcst/_nodes/tests/test_internal.py index 4696d118..595df940 100644 --- a/libcst/nodes/tests/test_internal.py +++ b/libcst/_nodes/tests/test_internal.py @@ -7,16 +7,16 @@ from typing import Tuple import libcst as cst -from libcst.metadata.position_provider import ( - BasicPositionProvider, - SyntacticPositionProvider, -) -from libcst.nodes._internal import ( +from libcst._nodes._internal import ( CodegenState, CodePosition, CodeRange, SyntacticCodegenState, ) +from libcst.metadata.position_provider import ( + BasicPositionProvider, + SyntacticPositionProvider, +) from libcst.testing.utils import UnitTest diff --git a/libcst/nodes/tests/test_lambda.py b/libcst/_nodes/tests/test_lambda.py similarity index 99% rename from libcst/nodes/tests/test_lambda.py rename to libcst/_nodes/tests/test_lambda.py index ca42e2a7..ba4eb3bf 100644 --- a/libcst/nodes/tests/test_lambda.py +++ b/libcst/_nodes/tests/test_lambda.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_leaf_small_statements.py b/libcst/_nodes/tests/test_leaf_small_statements.py similarity index 91% rename from libcst/nodes/tests/test_leaf_small_statements.py rename to libcst/_nodes/tests/test_leaf_small_statements.py index 3168d3d4..22144934 100644 --- a/libcst/nodes/tests/test_leaf_small_statements.py +++ b/libcst/_nodes/tests/test_leaf_small_statements.py @@ -5,7 +5,7 @@ # pyre-strict import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_list.py b/libcst/_nodes/tests/test_list.py similarity index 97% rename from libcst/nodes/tests/test_list.py rename to libcst/_nodes/tests/test_list.py index c8846e5a..e2dbabeb 100644 --- a/libcst/nodes/tests/test_list.py +++ b/libcst/_nodes/tests/test_list.py @@ -7,8 +7,8 @@ from typing import Any, Callable import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression, parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_module.py b/libcst/_nodes/tests/test_module.py similarity index 98% rename from libcst/nodes/tests/test_module.py rename to libcst/_nodes/tests/test_module.py index 2531ea7f..7e409e12 100644 --- a/libcst/nodes/tests/test_module.py +++ b/libcst/_nodes/tests/test_module.py @@ -7,9 +7,9 @@ from typing import Tuple, cast import libcst as cst +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.metadata.position_provider import SyntacticPositionProvider -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest from libcst.parser import parse_module from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_newline.py b/libcst/_nodes/tests/test_newline.py similarity index 95% rename from libcst/nodes/tests/test_newline.py rename to libcst/_nodes/tests/test_newline.py index 4992d88e..b0f1239a 100644 --- a/libcst/nodes/tests/test_newline.py +++ b/libcst/_nodes/tests/test_newline.py @@ -7,7 +7,7 @@ from typing import Callable import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_nonlocal.py b/libcst/_nodes/tests/test_nonlocal.py similarity index 98% rename from libcst/nodes/tests/test_nonlocal.py rename to libcst/_nodes/tests/test_nonlocal.py index ddb4ba46..cafab786 100644 --- a/libcst/nodes/tests/test_nonlocal.py +++ b/libcst/_nodes/tests/test_nonlocal.py @@ -8,8 +8,8 @@ from typing import Callable, Optional import libcst as cst from libcst._helpers import ensure_type -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_number.py b/libcst/_nodes/tests/test_number.py similarity index 97% rename from libcst/nodes/tests/test_number.py rename to libcst/_nodes/tests/test_number.py index 43469904..dcea73c6 100644 --- a/libcst/nodes/tests/test_number.py +++ b/libcst/_nodes/tests/test_number.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_raise.py b/libcst/_nodes/tests/test_raise.py similarity index 98% rename from libcst/nodes/tests/test_raise.py rename to libcst/_nodes/tests/test_raise.py index ca33a17a..36e976b6 100644 --- a/libcst/nodes/tests/test_raise.py +++ b/libcst/_nodes/tests/test_raise.py @@ -8,8 +8,8 @@ from typing import Callable, Optional import libcst as cst from libcst._helpers import ensure_type -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_removal_behavior.py b/libcst/_nodes/tests/test_removal_behavior.py similarity index 98% rename from libcst/nodes/tests/test_removal_behavior.py rename to libcst/_nodes/tests/test_removal_behavior.py index 2cbceaa3..d89625d5 100644 --- a/libcst/nodes/tests/test_removal_behavior.py +++ b/libcst/_nodes/tests/test_removal_behavior.py @@ -7,9 +7,9 @@ from typing import Type, TypeVar, Union import libcst as cst +from libcst._nodes.tests.base import CSTNodeTest from libcst._removal_sentinel import RemovalSentinel from libcst._visitors import CSTTransformer -from libcst.nodes.tests.base import CSTNodeTest from libcst.parser import parse_module from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_return.py b/libcst/_nodes/tests/test_return.py similarity index 97% rename from libcst/nodes/tests/test_return.py rename to libcst/_nodes/tests/test_return.py index 7499f535..2eb5a42c 100644 --- a/libcst/nodes/tests/test_return.py +++ b/libcst/_nodes/tests/test_return.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_set.py b/libcst/_nodes/tests/test_set.py similarity index 98% rename from libcst/nodes/tests/test_set.py rename to libcst/_nodes/tests/test_set.py index 56e72d92..86d333d8 100644 --- a/libcst/nodes/tests/test_set.py +++ b/libcst/_nodes/tests/test_set.py @@ -7,7 +7,7 @@ from typing import Any, Callable import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_simple_comp.py b/libcst/_nodes/tests/test_simple_comp.py similarity index 99% rename from libcst/nodes/tests/test_simple_comp.py rename to libcst/_nodes/tests/test_simple_comp.py index 6654e68b..64b59b21 100644 --- a/libcst/nodes/tests/test_simple_comp.py +++ b/libcst/_nodes/tests/test_simple_comp.py @@ -7,8 +7,8 @@ from typing import Any, Callable import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_simple_statement.py b/libcst/_nodes/tests/test_simple_statement.py similarity index 99% rename from libcst/nodes/tests/test_simple_statement.py rename to libcst/_nodes/tests/test_simple_statement.py index 20cea672..b59b30ec 100644 --- a/libcst/nodes/tests/test_simple_statement.py +++ b/libcst/_nodes/tests/test_simple_statement.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_simple_whitespace.py b/libcst/_nodes/tests/test_simple_whitespace.py similarity index 98% rename from libcst/nodes/tests/test_simple_whitespace.py rename to libcst/_nodes/tests/test_simple_whitespace.py index f6d487ff..71569565 100644 --- a/libcst/nodes/tests/test_simple_whitespace.py +++ b/libcst/_nodes/tests/test_simple_whitespace.py @@ -7,7 +7,7 @@ from typing import Callable import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_small_statement.py b/libcst/_nodes/tests/test_small_statement.py similarity index 96% rename from libcst/nodes/tests/test_small_statement.py rename to libcst/_nodes/tests/test_small_statement.py index 9f7eb07c..8ed938a7 100644 --- a/libcst/nodes/tests/test_small_statement.py +++ b/libcst/_nodes/tests/test_small_statement.py @@ -7,8 +7,8 @@ from typing import Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_subscript.py b/libcst/_nodes/tests/test_subscript.py similarity index 99% rename from libcst/nodes/tests/test_subscript.py rename to libcst/_nodes/tests/test_subscript.py index 6c6b34fe..88ee4cdd 100644 --- a/libcst/nodes/tests/test_subscript.py +++ b/libcst/_nodes/tests/test_subscript.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_trailing_whitespace.py b/libcst/_nodes/tests/test_trailing_whitespace.py similarity index 95% rename from libcst/nodes/tests/test_trailing_whitespace.py rename to libcst/_nodes/tests/test_trailing_whitespace.py index e0b96e45..6c7e7c64 100644 --- a/libcst/nodes/tests/test_trailing_whitespace.py +++ b/libcst/_nodes/tests/test_trailing_whitespace.py @@ -5,7 +5,7 @@ # pyre-strict import libcst as cst -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes.tests.base import CSTNodeTest from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_try.py b/libcst/_nodes/tests/test_try.py similarity index 99% rename from libcst/nodes/tests/test_try.py rename to libcst/_nodes/tests/test_try.py index cc6b2dba..de1f3908 100644 --- a/libcst/nodes/tests/test_try.py +++ b/libcst/_nodes/tests/test_try.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_tuple.py b/libcst/_nodes/tests/test_tuple.py similarity index 99% rename from libcst/nodes/tests/test_tuple.py rename to libcst/_nodes/tests/test_tuple.py index 1c345490..7a28d7ce 100644 --- a/libcst/nodes/tests/test_tuple.py +++ b/libcst/_nodes/tests/test_tuple.py @@ -7,8 +7,8 @@ from typing import Any, Callable import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression, parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_unary_op.py b/libcst/_nodes/tests/test_unary_op.py similarity index 97% rename from libcst/nodes/tests/test_unary_op.py rename to libcst/_nodes/tests/test_unary_op.py index cfee506c..08d8e110 100644 --- a/libcst/nodes/tests/test_unary_op.py +++ b/libcst/_nodes/tests/test_unary_op.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_expression from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_while.py b/libcst/_nodes/tests/test_while.py similarity index 97% rename from libcst/nodes/tests/test_while.py rename to libcst/_nodes/tests/test_while.py index f18ee55f..0020ba6d 100644 --- a/libcst/nodes/tests/test_while.py +++ b/libcst/_nodes/tests/test_while.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_with.py b/libcst/_nodes/tests/test_with.py similarity index 98% rename from libcst/nodes/tests/test_with.py rename to libcst/_nodes/tests/test_with.py index 5c1428a9..a6153edb 100644 --- a/libcst/nodes/tests/test_with.py +++ b/libcst/_nodes/tests/test_with.py @@ -7,8 +7,8 @@ from typing import Callable, Optional import libcst as cst -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest, DummyIndentedBlock +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest, DummyIndentedBlock from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/nodes/tests/test_yield.py b/libcst/_nodes/tests/test_yield.py similarity index 98% rename from libcst/nodes/tests/test_yield.py rename to libcst/_nodes/tests/test_yield.py index 1572032c..e5271e02 100644 --- a/libcst/nodes/tests/test_yield.py +++ b/libcst/_nodes/tests/test_yield.py @@ -8,8 +8,8 @@ from typing import Callable, Optional import libcst as cst from libcst._helpers import ensure_type -from libcst.nodes._internal import CodeRange -from libcst.nodes.tests.base import CSTNodeTest +from libcst._nodes._internal import CodeRange +from libcst._nodes.tests.base import CSTNodeTest from libcst.parser import parse_statement from libcst.testing.utils import data_provider diff --git a/libcst/_visitors.py b/libcst/_visitors.py index 2eb9ff72..f00c5b16 100644 --- a/libcst/_visitors.py +++ b/libcst/_visitors.py @@ -12,7 +12,7 @@ from libcst.metadata._interface import _MetadataInterface if TYPE_CHECKING: # Circular dependency for typing reasons only - from libcst.nodes._base import CSTNode # noqa: F401 + from libcst._nodes._base import CSTNode # noqa: F401 CSTVisitorT = Union["CSTTransformer", "CSTVisitor"] diff --git a/libcst/metadata/_interface.py b/libcst/metadata/_interface.py index 13811f48..80642291 100644 --- a/libcst/metadata/_interface.py +++ b/libcst/metadata/_interface.py @@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, ClassVar, Collection, Type, TypeVar if TYPE_CHECKING: # Circular dependency for typing reasons only - from libcst.nodes._base import CSTNode # noqa: F401 + from libcst._nodes._base import CSTNode # noqa: F401 from libcst.metadata.base_provider import BaseMetadataProvider # noqa: F401 diff --git a/libcst/metadata/base_provider.py b/libcst/metadata/base_provider.py index 0bbe55d7..eb4f6d03 100644 --- a/libcst/metadata/base_provider.py +++ b/libcst/metadata/base_provider.py @@ -13,9 +13,9 @@ from libcst._batched_visitor import ( _get_visitor_methods, ) from libcst._exceptions import MetadataException +from libcst._nodes._module import _ModuleSelfT as _ModuleT from libcst._visitors import CSTVisitor from libcst.metadata._interface import _MetadataInterface -from libcst.nodes._module import _ModuleSelfT as _ModuleT _T_co = TypeVar("_T_co", covariant=True) diff --git a/libcst/metadata/position_provider.py b/libcst/metadata/position_provider.py index f766f554..6730aebb 100644 --- a/libcst/metadata/position_provider.py +++ b/libcst/metadata/position_provider.py @@ -4,9 +4,9 @@ # LICENSE file in the root directory of this source tree. # pyre-strict +from libcst._nodes._internal import CodeRange +from libcst._nodes._module import _ModuleSelfT as _ModuleT from libcst.metadata.base_provider import BaseMetadataProvider -from libcst.nodes._internal import CodeRange -from libcst.nodes._module import _ModuleSelfT as _ModuleT class BasicPositionProvider(BaseMetadataProvider[CodeRange]): diff --git a/libcst/metadata/runner.py b/libcst/metadata/runner.py index 0889d305..f3c71fb7 100644 --- a/libcst/metadata/runner.py +++ b/libcst/metadata/runner.py @@ -7,13 +7,13 @@ from typing import MutableSet, Type from libcst._exceptions import MetadataException +from libcst._nodes._module import _ModuleSelfT as _ModuleT from libcst._visitors import CSTVisitorT from libcst.metadata.base_provider import ( BaseMetadataProvider, BatchableMetadataProvider, _run_batchable, ) -from libcst.nodes._module import _ModuleSelfT as _ModuleT ProviderT = Type[BaseMetadataProvider[object]] diff --git a/libcst/metadata/tests/test_position_provider.py b/libcst/metadata/tests/test_position_provider.py index 3d0b2fc4..fdd6ba66 100644 --- a/libcst/metadata/tests/test_position_provider.py +++ b/libcst/metadata/tests/test_position_provider.py @@ -6,9 +6,9 @@ # pyre-strict import libcst as cst from libcst._batched_visitor import BatchableCSTVisitor, visit_batched +from libcst._nodes._internal import CodeRange from libcst._visitors import CSTTransformer from libcst.metadata.position_provider import SyntacticPositionProvider -from libcst.nodes._internal import CodeRange from libcst.parser import parse_module from libcst.testing.utils import UnitTest diff --git a/libcst/parser/_conversions/dummy.py b/libcst/parser/_conversions/dummy.py index 044e8168..9848fd59 100644 --- a/libcst/parser/_conversions/dummy.py +++ b/libcst/parser/_conversions/dummy.py @@ -5,8 +5,8 @@ from typing import Any, List, Sequence, Union -from libcst.nodes._base import CSTNode -from libcst.nodes._dummy import DummyNode +from libcst._nodes._base import CSTNode +from libcst._nodes._dummy import DummyNode from libcst.parser._types.config import ParserConfig from libcst.parser._types.partials import WithLeadingWhitespace from libcst.parser._types.token import Token diff --git a/libcst/parser/_conversions/expression.py b/libcst/parser/_conversions/expression.py index e7bc125e..caee5c17 100644 --- a/libcst/parser/_conversions/expression.py +++ b/libcst/parser/_conversions/expression.py @@ -13,7 +13,7 @@ from typing import Any, Dict, List, Sequence, Type, Union import libcst as cst from libcst._maybe_sentinel import MaybeSentinel -from libcst.nodes._dummy import DummyNode +from libcst._nodes._dummy import DummyNode from libcst.parser._conversions.dummy import make_dummy_node from libcst.parser._custom_itertools import grouper from libcst.parser._production_decorator import with_production diff --git a/libcst/parser/_conversions/module.py b/libcst/parser/_conversions/module.py index 6017040a..a63ddfdf 100644 --- a/libcst/parser/_conversions/module.py +++ b/libcst/parser/_conversions/module.py @@ -6,7 +6,7 @@ from typing import Any, Sequence import libcst as cst -from libcst.nodes._whitespace import NEWLINE_RE +from libcst._nodes._whitespace import NEWLINE_RE from libcst.parser._production_decorator import with_production from libcst.parser._types.config import ParserConfig diff --git a/libcst/parser/_detect_config.py b/libcst/parser/_detect_config.py index de9ae4e1..9341fb8f 100644 --- a/libcst/parser/_detect_config.py +++ b/libcst/parser/_detect_config.py @@ -14,7 +14,7 @@ from typing import Iterable, Iterator, Union from parso.python.token import PythonTokenTypes, TokenType from parso.utils import split_lines -from libcst.nodes._whitespace import NEWLINE_RE +from libcst._nodes._whitespace import NEWLINE_RE from libcst.parser._types.config import AutoConfig, ParserConfig, PartialParserConfig from libcst.parser._types.token import Token from libcst.parser._wrapped_tokenize import tokenize_lines diff --git a/libcst/parser/_types/config.py b/libcst/parser/_types/config.py index 1de9ab3a..9ff59f24 100644 --- a/libcst/parser/_types/config.py +++ b/libcst/parser/_types/config.py @@ -15,7 +15,7 @@ from typing import Pattern, Sequence, Union from parso.utils import PythonVersionInfo, parse_version_string from libcst._add_slots import add_slots -from libcst.nodes._whitespace import NEWLINE_RE +from libcst._nodes._whitespace import NEWLINE_RE _INDENT_RE: Pattern[str] = re.compile(r"[ \t]+") diff --git a/libcst/parser/_whitespace_parser.py b/libcst/parser/_whitespace_parser.py index b2520240..a4d3ad71 100644 --- a/libcst/parser/_whitespace_parser.py +++ b/libcst/parser/_whitespace_parser.py @@ -19,7 +19,7 @@ hand-rolled recursive descent parser. from typing import List, Optional, Sequence, Tuple, Union import libcst as cst -from libcst.nodes._whitespace import COMMENT_RE, NEWLINE_RE, SIMPLE_WHITESPACE_RE +from libcst._nodes._whitespace import COMMENT_RE, NEWLINE_RE, SIMPLE_WHITESPACE_RE from libcst.parser._types.config import BaseWhitespaceParserConfig from libcst.parser._types.whitespace_state import WhitespaceState as State diff --git a/libcst/parser/tests/test_footer_behavior.py b/libcst/parser/tests/test_footer_behavior.py index 59f48070..68fae0e5 100644 --- a/libcst/parser/tests/test_footer_behavior.py +++ b/libcst/parser/tests/test_footer_behavior.py @@ -7,7 +7,7 @@ from textwrap import dedent import libcst as cst -from libcst.nodes._deep_equals import deep_equals +from libcst._nodes._deep_equals import deep_equals from libcst.parser import parse_module from libcst.testing.utils import UnitTest, data_provider diff --git a/libcst/parser/tests/test_whitespace_parser.py b/libcst/parser/tests/test_whitespace_parser.py index 4ede4383..4792f262 100644 --- a/libcst/parser/tests/test_whitespace_parser.py +++ b/libcst/parser/tests/test_whitespace_parser.py @@ -8,7 +8,7 @@ from dataclasses import dataclass from typing import Callable, Sequence, TypeVar import libcst as cst -from libcst.nodes._deep_equals import deep_equals +from libcst._nodes._deep_equals import deep_equals from libcst.parser._types.config import BaseWhitespaceParserConfig from libcst.parser._types.whitespace_state import WhitespaceState as State from libcst.parser._whitespace_parser import ( diff --git a/libcst/tool.py b/libcst/tool.py index 4cf5ce64..24776961 100644 --- a/libcst/tool.py +++ b/libcst/tool.py @@ -15,7 +15,7 @@ import sys from typing import List, Sequence from libcst import CSTNode, IndentedBlock, Module -from libcst.nodes._deep_equals import deep_equals +from libcst._nodes._deep_equals import deep_equals from libcst.parser import parse_module