Skip to content

Commit

Permalink
gh-92064: Fix global variable name collision in test_typing (#92067)
Browse files Browse the repository at this point in the history
Fixes #92064
  • Loading branch information
sweeneyde authored Apr 30, 2022
1 parent 2f7952c commit a29aa76
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions Lib/test/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1332,36 +1332,36 @@ class TypeVarTuplePicklingTests(BaseTestCase):

@all_pickle_protocols
def test_pickling_then_unpickling_results_in_same_identity(self, proto):
global Ts1 # See explanation at start of class.
Ts1 = TypeVarTuple('Ts1')
Ts2 = pickle.loads(pickle.dumps(Ts1, proto))
self.assertIs(Ts1, Ts2)
global global_Ts1 # See explanation at start of class.
global_Ts1 = TypeVarTuple('global_Ts1')
global_Ts2 = pickle.loads(pickle.dumps(global_Ts1, proto))
self.assertIs(global_Ts1, global_Ts2)

@all_pickle_protocols
def test_pickling_then_unpickling_unpacked_results_in_same_identity(self, proto):
global Ts # See explanation at start of class.
Ts = TypeVarTuple('Ts')
unpacked1 = Unpack[Ts]
global global_Ts # See explanation at start of class.
global_Ts = TypeVarTuple('global_Ts')
unpacked1 = Unpack[global_Ts]
unpacked2 = pickle.loads(pickle.dumps(unpacked1, proto))
self.assertIs(unpacked1, unpacked2)

@all_pickle_protocols
def test_pickling_then_unpickling_tuple_with_typevartuple_equality(
self, proto
):
global T, Ts # See explanation at start of class.
T = TypeVar('T')
Ts = TypeVarTuple('Ts')
global global_T, global_Ts # See explanation at start of class.
global_T = TypeVar('global_T')
global_Ts = TypeVarTuple('global_Ts')

a1 = Tuple[Unpack[Ts]]
a1 = Tuple[Unpack[global_Ts]]
a2 = pickle.loads(pickle.dumps(a1, proto))
self.assertEqual(a1, a2)

a1 = Tuple[T, Unpack[Ts]]
a1 = Tuple[T, Unpack[global_Ts]]
a2 = pickle.loads(pickle.dumps(a1, proto))
self.assertEqual(a1, a2)

a1 = Tuple[int, Unpack[Ts]]
a1 = Tuple[int, Unpack[global_Ts]]
a2 = pickle.loads(pickle.dumps(a1, proto))
self.assertEqual(a1, a2)

Expand Down

0 comments on commit a29aa76

Please sign in to comment.