Find path to FreeCAD.so when importing from external python on MacOS #624
Conversation
This file contains 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
Contributor
ianrrees
commented
Mar 17, 2017
•
ianrrees
commented
- snuck in before checklists
ianrrees
force-pushed
the
20170317-import-from-external-python
branch
from
6d3ce69
to
c23d363
Compare
ianrrees
commented
Mar 18, 2017
src/App/Application.cpp
Outdated
| pos = TempHomePath.find_last_of(PATHSEP); | ||
| TempHomePath.assign(TempHomePath,0,pos+1); | ||
| return TempHomePath; | ||
| if ( !PyString_Check(pyPath) ) |
There was a problem hiding this comment.
I'll add a conditional Python3 version of this shortly
ianrrees
force-pushed
the
20170317-import-from-external-python
branch
from
c23d363
to
da4ea8d
Compare
looooo
reviewed
Mar 18, 2017
src/App/Application.cpp
Outdated
| if ( !PyString_Check(pyPath) ) | ||
| continue; | ||
| std::string path( PyString_AsString(pyPath) ); | ||
| #endif // #if/else PY_MAJOR_VERSION >= 3 |
There was a problem hiding this comment.
maybe checking for PyUnicode (python2 and 3)? and elif checking for PyString for python2?
if ( !PyUnicode_Check(pyPath) )
std::string path( PyUnicode_AsUTF8(pyPath) );
#if PY_MAJOR_VERSION < 3
if ( !PyString_Check(pyPath)
std::string path( PyString_AsString(pyPath) );
+#endif // #if/else PY_MAJOR_VERSION < 3
There was a problem hiding this comment.
Sure, I'll change it to test for (unicode || string) in Python2 and just unicode in Python3.
However, I should note that this isn't going to add additional functionality until 2973 is fixed.
ianrrees
force-pushed
the
20170317-import-from-external-python
branch
2 times, most recently
from
d537f6e
to
8b0fd78
Compare
|
Out of curiosity, shouldn't the code to check for FreeCAD.so be located in MainPy.cpp? |
|
Aha, yes, I think it should. I'll try to change this PR tomorrow. Thanks! |
ianrrees
force-pushed
the
20170317-import-from-external-python
branch
from
8b0fd78
to
8afb156
Compare
ianrrees
force-pushed
the
20170317-import-from-external-python
branch
from
8afb156
to
d379d65
Compare
|
Forgot to comment yesterday that I've updated this to put most of the changes in MainPy.cpp. Thanks! |
|
Merged. |
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.