From 8f6aad7b996a3fafffd4c0f576d8ce83f43cdf71 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Wed, 4 Oct 2023 10:42:19 +0200 Subject: [PATCH] resolve merge changes --- Lib/test/test_copy.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py index 127a29d518168a..c2036a3e949f72 100644 --- a/Lib/test/test_copy.py +++ b/Lib/test/test_copy.py @@ -959,13 +959,13 @@ class PointFromClass(NamedTuple): with self.subTest(Point=Point): p = Point(11, 22) self.assertIsInstance(p, Point) - self.assertEqual(copy.replace(p), (11, 22)) - self.assertIsInstance(copy.replace(p), Point) - self.assertEqual(copy.replace(p, x=1), (1, 22)) - self.assertEqual(copy.replace(p, y=2), (11, 2)) - self.assertEqual(copy.replace(p, x=1, y=2), (1, 2)) + self.assertEqual(self.copy_module.replace(p), (11, 22)) + self.assertIsInstance(self.copy_module.replace(p), Point) + self.assertEqual(self.copy_module.replace(p, x=1), (1, 22)) + self.assertEqual(self.copy_module.replace(p, y=2), (11, 2)) + self.assertEqual(self.copy_module.replace(p, x=1, y=2), (1, 2)) with self.assertRaisesRegex(ValueError, 'unexpected field name'): - copy.replace(p, x=1, error=2) + self.copy_module.replace(p, x=1, error=2) def test_dataclass(self): from dataclasses import dataclass