Make nodes package private

Now that nodes are imported from the top level, make the nodes
directory private.

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__ = [

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
 
 

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)
 

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:

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

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

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,

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:

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):

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)

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

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 
 

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
 

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
 

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
 
 

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
 
 

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 
 

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
 

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
 
 

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
 

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
 

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 
 

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
 
 

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
 

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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"]

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
 
 

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)

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]):

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]]

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
 

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

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

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
 

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

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]+")

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
 

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
 

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 (

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