rewrite: rename abstract.instances to abstract.containers.

rchen152 · rchen152 · commit fe65fc548a35 · 2024-04-10T14:40:19.000-07:00
PiperOrigin-RevId: 623328948
diff --git a/pytype/rewrite/abstract/CMakeLists.txt b/pytype/rewrite/abstract/CMakeLists.txt
@@ -8,8 +8,8 @@ py_library(
   DEPS
     .base
     .classes
+    .containers
     .functions
-    .instances
     .internal
     .utils
 )
@@ -63,43 +63,43 @@ py_test(
 
 py_library(
   NAME
-    functions
+    containers
   SRCS
-    functions.py
+    containers.py
   DEPS
     .base
-    pytype.blocks.blocks
-    pytype.pytd.pytd
 )
 
 py_test(
   NAME
-    functions_test
+    containers_test
   SRCS
-    functions_test.py
+    containers_test.py
   DEPS
-    .classes
-    .functions
+    .base
+    .containers
     pytype.rewrite.tests.test_utils
 )
 
 py_library(
   NAME
-    instances
+    functions
   SRCS
-    instances.py
+    functions.py
   DEPS
     .base
+    pytype.blocks.blocks
+    pytype.pytd.pytd
 )
 
 py_test(
   NAME
-    instances_test
+    functions_test
   SRCS
-    instances_test.py
+    functions_test.py
   DEPS
-    .base
-    .instances
+    .classes
+    .functions
     pytype.rewrite.tests.test_utils
 )
 
diff --git a/pytype/rewrite/abstract/abstract.py b/pytype/rewrite/abstract/abstract.py
@@ -2,8 +2,8 @@
 
 from pytype.rewrite.abstract import base as _base
 from pytype.rewrite.abstract import classes as _classes
+from pytype.rewrite.abstract import containers as _containers
 from pytype.rewrite.abstract import functions as _functions
-from pytype.rewrite.abstract import instances as _instances
 from pytype.rewrite.abstract import internal as _internal
 from pytype.rewrite.abstract import utils as _utils
 
@@ -31,10 +31,10 @@
 SimpleFunction = _functions.SimpleFunction
 SimpleReturn = _functions.SimpleReturn
 
-Dict = _instances.Dict
-List = _instances.List
-Set = _instances.Set
-Tuple = _instances.Tuple
+Dict = _containers.Dict
+List = _containers.List
+Set = _containers.Set
+Tuple = _containers.Tuple
 
 ConstKeyDict = _internal.ConstKeyDict
 Splat = _internal.Splat
diff --git a/pytype/rewrite/abstract/containers.py b/pytype/rewrite/abstract/containers.py
@@ -1,4 +1,4 @@
-"""Abstract representations of class instances."""
+"""Abstract representations of builtin containers."""
 
 import logging
 
diff --git a/pytype/rewrite/abstract/containers_test.py b/pytype/rewrite/abstract/containers_test.py
@@ -1,7 +1,7 @@
 from typing import Dict, List, Set, Tuple
 
 from pytype.rewrite.abstract import base
-from pytype.rewrite.abstract import instances
+from pytype.rewrite.abstract import containers
 from pytype.rewrite.tests import test_utils
 from typing_extensions import assert_type
 
@@ -22,7 +22,7 @@ class ListTest(BaseTest):
 
   def test_constant_type(self):
     a = self.const_var("a")
-    c = instances.List(self.ctx, [a])
+    c = containers.List(self.ctx, [a])
     assert_type(c.constant, List[_AbstractVariable])
 
 
@@ -31,15 +31,15 @@ class DictTest(BaseTest):
   def test_constant_type(self):
     a = self.const_var("a")
     b = self.const_var("b")
-    c = instances.Dict(self.ctx, {a: b})
+    c = containers.Dict(self.ctx, {a: b})
     assert_type(c.constant, Dict[_AbstractVariable, _AbstractVariable])
 
 
 class SetTest(BaseTest):
 
   def test_constant_type(self):
     a = self.const_var("a")
-    c = instances.Set(self.ctx, {a})
+    c = containers.Set(self.ctx, {a})
     assert_type(c.constant, Set[_AbstractVariable])
 
 
@@ -48,7 +48,7 @@ class TupleTest(BaseTest):
   def test_constant_type(self):
     a = self.const_var("a")
     b = self.const_var("b")
-    c = instances.Tuple(self.ctx, (a, b))
+    c = containers.Tuple(self.ctx, (a, b))
     assert_type(c.constant, Tuple[_AbstractVariable, ...])
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-"""Abstract representations of class instances."""`
	`1`	`+"""Abstract representations of builtin containers."""`
`2`	`2`
`3`	`3`	`import logging`
`4`	`4`