diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py index 211d1db022a..e9c46c2c203 100644 --- a/Lib/ctypes/test/test_bitfields.py +++ b/Lib/ctypes/test/test_bitfields.py @@ -240,20 +240,5 @@ class BitFieldTest(unittest.TestCase): _anonymous_ = ["_"] _fields_ = [("_", X)] - def test_uint32(self): - class X(Structure): - _fields_ = [("a", c_uint32, 32)] - x = X() - x.a = 10 - self.failUnlessEqual(x.a, 10) - - def test_uint64(self): - class X(Structure): - _fields_ = [("a", c_uint64, 64)] - x = X() - x.a = 10 - self.failUnlessEqual(x.a, 10) - - if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS b/Misc/NEWS index d175786e5ed..77e3ac6acae 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -349,8 +349,6 @@ Core and Builtins Library ------- -- Issue #6493: Fix a ctypes problem setting bitfields more than 31 bits wide. - - unittest has been split up into a package. All old names should still work. - Issue #6431: Make Fraction type return NotImplemented when it doesn't diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index 766348189af..bf247bc41b7 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -426,9 +426,9 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) #define LOW_BIT(x) ((x) & 0xFFFF) #define NUM_BITS(x) ((x) >> 16) -/* This seems more a compiler issue than a Windows/non-Windows one */ +/* This seems nore a compiler issue than a Windows/non-Windows one */ #ifdef MS_WIN32 -# define BIT_MASK(size) ((1i64 << NUM_BITS(size))-1) +# define BIT_MASK(size) ((1 << NUM_BITS(size))-1) #else # define BIT_MASK(size) ((1LL << NUM_BITS(size))-1) #endif