Skip to content

Commit dc209df

Browse files
Commit 619535e still had thread_allow in wrong place
1 parent ae9740c commit dc209df

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

CHANGELOG.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ GNU General Public License for more details.
1515
You should have received a copy of the GNU General Public License
1616
along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18-
Changes in 1.3.0:
18+
Changes in 1.3.1:
1919
1/ Reworked Python interface to logging callback functions.
2020
2/ Renamed submodules and revised build process.
2121
3/ Hid xxx_ref, xxx_unref & xxx_free functions from Python.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import sys
2828

2929
# python-gphoto2 version
30-
version = '1.3.0'
30+
version = '1.3.1'
3131

3232
# get gphoto2 library config
3333
gphoto2_version = '.'.join(subprocess.check_output(

src/macros.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
153153

154154
%define MEMBER_FUNCTION_THREAD(type, py_type, member, member_args, function, function_args)
155155
%exception type::member {
156-
SWIG_PYTHON_THREAD_BEGIN_ALLOW;
157156
$action
158-
SWIG_PYTHON_THREAD_END_ALLOW;
159157
if (PyErr_Occurred() != NULL) SWIG_fail;
160158
}
161159
%extend type {
162160
%feature("docstring") "See also: gphoto2." #function
163161
void member member_args {
162+
SWIG_PYTHON_THREAD_BEGIN_ALLOW;
164163
int error = function function_args;
164+
SWIG_PYTHON_THREAD_END_ALLOW;
165165
if (error < GP_OK) GPHOTO2_ERROR(error)
166166
}
167167
};

0 commit comments

Comments
 (0)