Skip to content
Snippets Groups Projects
Commit 856d3adf authored by Russell Taylor's avatar Russell Taylor
Browse files

Re #4311. Return the docstring of the proxied object.

This helps the correct documentation string show up in the IPython console.
I've also turned on automatic docstring generation in our sip call.
parent c666845e
No related branches found
No related tags found
No related merge requests found
...@@ -518,7 +518,7 @@ set( SRC_UNITY_IGNORE_FILES ) ...@@ -518,7 +518,7 @@ set( SRC_UNITY_IGNORE_FILES )
add_custom_command ( OUTPUT ${SIP_SRC_AUTO} add_custom_command ( OUTPUT ${SIP_SRC_AUTO}
COMMAND ${SIP_EXECUTABLE} COMMAND ${SIP_EXECUTABLE}
-I ${PYQT4_SIP_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR}/../MantidQt/Python ${PYQT4_SIP_FLAGS} -I ${PYQT4_SIP_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR}/../MantidQt/Python ${PYQT4_SIP_FLAGS}
-c ${CMAKE_CURRENT_BINARY_DIR} -j1 -w -c ${CMAKE_CURRENT_BINARY_DIR} -j1 -w -o
${SIP_SPEC} ${SIP_SPEC}
DEPENDS src/qti.sip ${SIP_HDRS} DEPENDS src/qti.sip ${SIP_HDRS}
COMMENT "Generating python bindings using sip" COMMENT "Generating python bindings using sip"
......
...@@ -29,6 +29,7 @@ class CrossThreadCall(QtCore.QObject): ...@@ -29,6 +29,7 @@ class CrossThreadCall(QtCore.QObject):
QtCore.QObject.__init__(self) QtCore.QObject.__init__(self)
self.moveToThread(QtGui.qApp.thread()) self.moveToThread(QtGui.qApp.thread())
self.__callable = callable self.__callable = callable
self.__call__.__func__.__doc__ = callable.__doc__
def dispatch(self, *args, **kwargs): def dispatch(self, *args, **kwargs):
"""Dispatches a call to callable with """Dispatches a call to callable with
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment