traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-33023: Fix NotImplemented to NotImplementedError. (GH-10934)

This commit is contained in:
Serhiy Storchaka 2018-12-06 22:36:55 +02:00 committed by GitHub
parent 20428527a7
commit 42b1d6127b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/idlelib/debugger_r.py
View File

@ -157,7 +157,7 @@ class IdbAdapter:
#----------called by a DictProxy---------- #----------called by a DictProxy----------
def dict_keys(self, did): def dict_keys(self, did):
raise NotImplemented("dict_keys not public or pickleable") raise NotImplementedError("dict_keys not public or pickleable")
## dict = dicttable[did] ## dict = dicttable[did]
## return dict.keys() ## return dict.keys()

2
Lib/ssl.py
View File

@ -884,7 +884,7 @@ class SSLSocket(socket):
return self._sslobj.session_reused return self._sslobj.session_reused
def dup(self): def dup(self):
raise NotImplemented("Can't dup() %s instances" % raise NotImplementedError("Can't dup() %s instances" %
self.__class__.__name__) self.__class__.__name__)
def _checkClosed(self, msg=None): def _checkClosed(self, msg=None):

7
Lib/test/test_ssl.py
View File

@ -463,8 +463,12 @@ class BasicSocketTests(unittest.TestCase):
self.assertRaises(OSError, ss.recvfrom_into, bytearray(b'x'), 1) self.assertRaises(OSError, ss.recvfrom_into, bytearray(b'x'), 1)
self.assertRaises(OSError, ss.send, b'x') self.assertRaises(OSError, ss.send, b'x')
self.assertRaises(OSError, ss.sendto, b'x', ('0.0.0.0', 0)) self.assertRaises(OSError, ss.sendto, b'x', ('0.0.0.0', 0))
self.assertRaises(NotImplementedError, ss.dup)
self.assertRaises(NotImplementedError, ss.sendmsg, self.assertRaises(NotImplementedError, ss.sendmsg,
[b'x'], (), 0, ('0.0.0.0', 0)) [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): def test_timeout(self):
# Issue #8524: when creating an SSL socket, the timeout of the # Issue #8524: when creating an SSL socket, the timeout of the
@ -3382,10 +3386,11 @@ class ThreadedTests(unittest.TestCase):
# Make sure sendmsg et al are disallowed to avoid # Make sure sendmsg et al are disallowed to avoid
# inadvertent disclosure of data and/or corruption # inadvertent disclosure of data and/or corruption
# of the encrypted data stream # of the encrypted data stream
self.assertRaises(NotImplementedError, s.dup)
self.assertRaises(NotImplementedError, s.sendmsg, [b"data"]) self.assertRaises(NotImplementedError, s.sendmsg, [b"data"])
self.assertRaises(NotImplementedError, s.recvmsg, 100) self.assertRaises(NotImplementedError, s.recvmsg, 100)
self.assertRaises(NotImplementedError, self.assertRaises(NotImplementedError,
s.recvmsg_into, bytearray(100)) s.recvmsg_into, [bytearray(100)])
s.write(b"over\n") s.write(b"over\n")
self.assertRaises(ValueError, s.recv, -1) self.assertRaises(ValueError, s.recv, -1)