diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/inspect.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_struct.py | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index 3b58bd8..da55ac6 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -158,9 +158,8 @@ def isgeneratorfunction(object): Generator function objects provides same attributes as functions. See isfunction.__doc__ for attributes listing.""" - if (isfunction(object) or ismethod(object)) and \ - object.__code__.co_flags & CO_GENERATOR: - return True + return bool((isfunction(object) or ismethod(object)) and + object.__code__.co_flags & CO_GENERATOR) def isgenerator(object): """Return true if the object is a generator. diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 00219b8..bdbc397 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -2,6 +2,8 @@ import array import unittest import struct import warnings +warnings.filterwarnings("ignore", "struct integer overflow masking is deprecated", + DeprecationWarning) from functools import wraps from test.support import TestFailed, verbose, run_unittest @@ -469,6 +471,11 @@ class StructTest(unittest.TestCase): self.check_float_coerce(endian + fmt, 1.0) self.check_float_coerce(endian + fmt, 1.5) + def test_issue4228(self): + # Packing a long may yield either 32 or 64 bits + x = struct.pack('L', -1)[:4] + self.assertEqual(x, b'\xff'*4) + def test_unpack_from(self): test_string = b'abcd01234' fmt = '4s' |