Import the ctypes module. #767
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rudi-c
force-pushed
the
ctypes
branch
2 times, most recently
from
1ed9b71 to
6730b88
Compare
| @@ -719,6 +719,9 @@ vBOOL_get(void *ptr, Py_ssize_t size) | |||
| } | |||
| #endif | |||
|
|
|||
| // Pyston change: We don't run CPython's ./configure so we didn't have this defined. | |||
| #define SIZEOF__BOOL 1 | |||
There was a problem hiding this comment.
Could we just put this in our pyconfig.h?
There was a problem hiding this comment.
True, that is a better place.
|
could we get a test that just imports ctypes? |
rudi-c
force-pushed
the
ctypes
branch
2 times, most recently
from
096f88d to
59e4e06
Compare
If both a metaclass and an instance of it are defined in C extensions, the metaclass doesn't have attrs_offset != 0 or tp_dictoffset != 0 which causes the call to PyType_Ready on the instance to fail.
- Temporarily disable code for ctypes that requires class descriptors. - Skip the attribute lookup for __new__ for the base type class and directly call a special function assigned to tp_new. - Add a #define from CPython's ./configure - Add test.
The test was passing before by using the fallback behavior, but importing ctypes successfully makes it try to use it and fails.
rudi-c
force-pushed
the
ctypes
branch
3 times, most recently
from
9300acd to
fb15223
Compare
|
Alright, all changes made, tests pass again. |
| @@ -2044,13 +2044,21 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) | |||
| break; | |||
| } | |||
|
|
|||
| if (ml) { | |||
| // TODO: Pyston change: | |||
There was a problem hiding this comment.
I think it's best if we can avoid these kinds of "soft" failures, since it'll potentially be much harder to debug why we get a no attribute "from_param" than a "hard" error like "Py_FatalError: unimplemented". I tried, though, to think of some other way to get around this, and I couldn't think of anything better so let's just go with this and hope we remember that this is here :)
|
Nice, this now supports the small usage we have in the dropbox codebase :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR allows us to compile the ctypes module and run
import ctypes. Functionality has not been tested. This is part of WIP to run NumPy.