[Python-checkins] Fix syntax warnings in tests introduced in bpo-15248. (GH-11932)

Serhiy Storchaka webhook-mailer at python.org
Tue Feb 19 06:49:14 EST 2019


https://github.com/python/cpython/commit/8e79e6e56f516385ccb761e407dfff3a39253180
commit: 8e79e6e56f516385ccb761e407dfff3a39253180
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-02-19T13:49:09+02:00
summary:

Fix syntax warnings in tests introduced in bpo-15248. (GH-11932)

files:
M Lib/test/test_bytes.py
M Lib/test/test_extcall.py
M Lib/test/test_tuple.py

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index f7454d9b36a8..a0913603e737 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -852,9 +852,10 @@ class BytesTest(BaseBytesTest, unittest.TestCase):
     type2test = bytes
 
     def test_getitem_error(self):
+        b = b'python'
         msg = "byte indices must be integers or slices"
         with self.assertRaisesRegex(TypeError, msg):
-            b'python'['a']
+            b['a']
 
     def test_buffer_is_readonly(self):
         fd = os.open(__file__, os.O_RDONLY)
@@ -1042,14 +1043,15 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase):
     type2test = bytearray
 
     def test_getitem_error(self):
+        b = bytearray(b'python')
         msg = "bytearray indices must be integers or slices"
         with self.assertRaisesRegex(TypeError, msg):
-            bytearray(b'python')['a']
+            b['a']
 
     def test_setitem_error(self):
+        b = bytearray(b'python')
         msg = "bytearray indices must be integers or slices"
         with self.assertRaisesRegex(TypeError, msg):
-            b = bytearray(b'python')
             b['a'] = "python"
 
     def test_nohash(self):
diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index a3ff4413eee6..3cac3bda4253 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -264,7 +264,8 @@
       ...
     TypeError: dir() argument after * must be an iterable, not function
 
-    >>> None(*h)
+    >>> nothing = None
+    >>> nothing(*h)
     Traceback (most recent call last):
       ...
     TypeError: NoneType object argument after * must be an iterable, \
@@ -305,7 +306,7 @@
       ...
     TypeError: dir() argument after ** must be a mapping, not function
 
-    >>> None(**h)
+    >>> nothing(**h)
     Traceback (most recent call last):
       ...
     TypeError: NoneType object argument after ** must be a mapping, \
diff --git a/Lib/test/test_tuple.py b/Lib/test/test_tuple.py
index ca46d0b5a645..d2a2ed310b05 100644
--- a/Lib/test/test_tuple.py
+++ b/Lib/test/test_tuple.py
@@ -19,9 +19,10 @@ class TupleTest(seq_tests.CommonTest):
     type2test = tuple
 
     def test_getitem_error(self):
+        t = ()
         msg = "tuple indices must be integers or slices"
         with self.assertRaisesRegex(TypeError, msg):
-            ()['a']
+            t['a']
 
     def test_constructors(self):
         super().test_constructors()



More information about the Python-checkins mailing list