diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-06 20:52:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 20:52:43 (GMT) |
| commit | 6485aa6eb1024672f08afdd577e2b5792eb6b03c (patch) | |
| tree | 56d314bba51eb6f4305f401a9b1633bc26bc16dc | |
| parent | 560fa4db17983ce37c1453c057901c627b2c3abc (diff) | |
| download | cpython-6485aa6eb1024672f08afdd577e2b5792eb6b03c.zip cpython-6485aa6eb1024672f08afdd577e2b5792eb6b03c.tar.gz cpython-6485aa6eb1024672f08afdd577e2b5792eb6b03c.tar.bz2 | |
bpo-33023: Fix NotImplemented to NotImplementedError. (GH-10934)
(cherry picked from commit 42b1d6127bd8595522a78a75166ebb9fba74a6a2)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
| -rw-r--r-- | Lib/idlelib/debugger_r.py | 2 | ||||
| -rw-r--r-- | Lib/ssl.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Lib/idlelib/debugger_r.py b/Lib/idlelib/debugger_r.py index 01a3bd2..0e6dcfb 100644 --- a/Lib/idlelib/debugger_r.py +++ b/Lib/idlelib/debugger_r.py @@ -157,7 +157,7 @@ class IdbAdapter: #----------called by a DictProxy---------- def dict_keys(self, did): - raise NotImplemented("dict_keys not public or pickleable") + raise NotImplementedError("dict_keys not public or pickleable") ## dict = dicttable[did] ## return dict.keys() @@ -884,8 +884,8 @@ class SSLSocket(socket): return self._sslobj.session_reused def dup(self): - raise NotImplemented("Can't dup() %s instances" % - self.__class__.__name__) + raise NotImplementedError("Can't dup() %s instances" % + self.__class__.__name__) def _checkClosed(self, msg=None): # raise an exception here if you wish to check for spurious closes diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index d4132c5..f1b9565 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -480,8 +480,12 @@ class BasicSocketTests(unittest.TestCase): self.assertRaises(OSError, ss.recvfrom_into, bytearray(b'x'), 1) self.assertRaises(OSError, ss.send, b'x') self.assertRaises(OSError, ss.sendto, b'x', ('0.0.0.0', 0)) + self.assertRaises(NotImplementedError, ss.dup) self.assertRaises(NotImplementedError, ss.sendmsg, [b'x'], (), 0, ('0.0.0.0', 0)) + self.assertRaises(NotImplementedError, ss.recvmsg, 100) + self.assertRaises(NotImplementedError, ss.recvmsg_into, + [bytearray(100)]) def test_timeout(self): # Issue #8524: when creating an SSL socket, the timeout of the @@ -3410,10 +3414,11 @@ class ThreadedTests(unittest.TestCase): # Make sure sendmsg et al are disallowed to avoid # inadvertent disclosure of data and/or corruption # of the encrypted data stream + self.assertRaises(NotImplementedError, s.dup) self.assertRaises(NotImplementedError, s.sendmsg, [b"data"]) self.assertRaises(NotImplementedError, s.recvmsg, 100) self.assertRaises(NotImplementedError, - s.recvmsg_into, bytearray(100)) + s.recvmsg_into, [bytearray(100)]) s.write(b"over\n") self.assertRaises(ValueError, s.recv, -1) |