bpo-41720: Add "return NotImplemented" in turtle.Vec2D.__rmul__(). (GH-22092)

This commit is contained in:
Serhiy Storchaka 2020-09-07 18:55:22 +03:00 committed by GitHub
parent 1baf030a90
commit fd4cafd470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions

View File

@ -130,6 +130,14 @@ class VectorComparisonMixin:
self.assertAlmostEqual( self.assertAlmostEqual(
i, j, msg='values at index {} do not match'.format(idx)) i, j, msg='values at index {} do not match'.format(idx))
class Multiplier:
def __mul__(self, other):
return f'M*{other}'
def __rmul__(self, other):
return f'{other}*M'
class TestVec2D(VectorComparisonMixin, unittest.TestCase): class TestVec2D(VectorComparisonMixin, unittest.TestCase):
@ -211,9 +219,15 @@ class TestVec2D(VectorComparisonMixin, unittest.TestCase):
self.assertAlmostEqual(answer, expected) self.assertAlmostEqual(answer, expected)
vec = Vec2D(0.5, 3) vec = Vec2D(0.5, 3)
answer = vec * 10
expected = Vec2D(5, 30) expected = Vec2D(5, 30)
self.assertVectorsAlmostEqual(answer, expected) self.assertVectorsAlmostEqual(vec * 10, expected)
self.assertVectorsAlmostEqual(10 * vec, expected)
self.assertVectorsAlmostEqual(vec * 10.0, expected)
self.assertVectorsAlmostEqual(10.0 * vec, expected)
M = Multiplier()
self.assertEqual(vec * M, Vec2D(f"{vec[0]}*M", f"{vec[1]}*M"))
self.assertEqual(M * vec, f'M*{vec}')
def test_vector_negative(self): def test_vector_negative(self):
vec = Vec2D(10, -10) vec = Vec2D(10, -10)

View File

@ -258,6 +258,7 @@ class Vec2D(tuple):
def __rmul__(self, other): def __rmul__(self, other):
if isinstance(other, int) or isinstance(other, float): if isinstance(other, int) or isinstance(other, float):
return Vec2D(self[0]*other, self[1]*other) return Vec2D(self[0]*other, self[1]*other)
return NotImplemented
def __sub__(self, other): def __sub__(self, other):
return Vec2D(self[0]-other[0], self[1]-other[1]) return Vec2D(self[0]-other[0], self[1]-other[1])
def __neg__(self): def __neg__(self):

View File

@ -0,0 +1,2 @@
Fixed :meth:`turtle.Vec2D.__rmul__` for arguments which are not int or
float.