From 7a3ddf1e418541a9daf29558e3afd409bea48abc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Aug 2017 15:04:01 +0200 Subject: [PATCH] Revert "Patch ComTypes with a small fix" This reverts commit 20f8051a7cc9b21f07dac4973ab7639029136403. It didn't work on Windows since there is no 'patch' on Windows. To fix this we'd have to pull in GNU's patch application as an additional dependency and that takes this to an additional level, especially seeing as to how I'm doing all this from an Ubuntu machine... Contributes to issue CURA-3823. --- projects/python-comtypes.cmake | 1 - projects/python-comtypes.patch | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 projects/python-comtypes.patch diff --git a/projects/python-comtypes.cmake b/projects/python-comtypes.cmake index ae67e39a..10ab1808 100644 --- a/projects/python-comtypes.cmake +++ b/projects/python-comtypes.cmake @@ -2,7 +2,6 @@ if(BUILD_OS_WINDOWS) ExternalProject_Add(PythonComtypes URL https://pypi.python.org/packages/85/11/722b9ce6725bf8160bd8aca68b1e61bd9db422ab12dae28daa7defab2cdc/comtypes-1.1.3-2.zip URL_MD5 4161cb8bc283a75af85e220ad662d5af - PATCH_COMMAND patch comtypes/__init__.py ${CMAKE_SOURCE_DIR}/cmake/python-comtypes.patch CONFIGURE_COMMAND "" BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --single-version-externally-managed --record=comtypes-install.log diff --git a/projects/python-comtypes.patch b/projects/python-comtypes.patch deleted file mode 100644 index 2cdd0a66..00000000 --- a/projects/python-comtypes.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- __init__.py 2017-08-11 14:40:35.464581556 +0200 -+++ __init__2.py 2017-08-11 14:40:47.677067679 +0200 -@@ -655,8 +655,10 @@ - rescode = func(self_, *args, **kw) - # If there is only a single output value, then do not expect it to - # be iterable. -- if len(outargs) == 1: # rescode is not iterable -- return rescode.__ctypes_from_outparam__() -+ if outnum == 1: # rescode is not iterable -+ if len(outargs) == 1: -+ rescode = rescode.__ctypes_from_outparam__() -+ return rescode - - rescode = list(rescode) - for outnum, o in outargs.items():