diff options
| author | Thomas Heller <theller@ctypes.org> | 2009-07-21 19:04:02 +0000 |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2009-07-21 19:04:02 +0000 |
| commit | d8431ae3bd3fea2b8a3c03d7d330c789c7bf7453 (patch) | |
| tree | 1faca75aff7e0af899e1b275dfec0395199f9395 | |
| parent | 24d9175ebe6c6eba6d7c648112a25bc1c14f83c1 (diff) | |
| download | cpython-git-d8431ae3bd3fea2b8a3c03d7d330c789c7bf7453.tar.gz | |
Revert rev 74134, as it does not completely fixx issue #6493.
| -rw-r--r-- | Lib/ctypes/test/test_bitfields.py | 15 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/cfield.c | 4 |
3 files changed, 2 insertions, 19 deletions
diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py index 211d1db022..e9c46c2c20 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() @@ -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 766348189a..bf247bc41b 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 |