Adjust thread and exception wrappers in BasicIo

Author: jim-easterbrook

src/interface/basicio.i

@@ -60,6 +60,7 @@ UNIQUE_PTR(Exiv2::BasicIo);
 // Some calls don't raise exceptions
 %noexception Exiv2::BasicIo::eof;
 %noexception Exiv2::BasicIo::error;
+%noexception Exiv2::BasicIo::ioType;
 %noexception Exiv2::BasicIo::isopen;
 %noexception Exiv2::BasicIo::path;
 
@@ -173,6 +174,8 @@ EXPOSE_OBJECT_BUFFER(Exiv2::BasicIo, true, true)
 A simple context manager for *mmap* / *munmap* data access. The
 *__enter__* method returns a :py:class:`memoryview` of the data."
 %ignore DataContext::DataContext;
+%thread DataContext::~DataContext;
+%thread DataContext::__exit__;
 %inline %{
 class DataContext {
 private:
@@ -184,9 +187,7 @@ public:
         parent(parent), isWriteable(isWriteable), mapped(false) {};
     ~DataContext() {
         if (mapped) {
-            SWIG_PYTHON_THREAD_BEGIN_ALLOW;
             parent->munmap();
-            SWIG_PYTHON_THREAD_END_ALLOW;
             parent->close();
         }
     };
@@ -207,11 +208,9 @@ public:
     };
     bool __exit__(PyObject* exc_type, PyObject* exc_val, PyObject* exc_tb) {
         if (mapped) {
-            SWIG_PYTHON_THREAD_BEGIN_ALLOW;
             parent->munmap();
             mapped = false;
             parent->close();
-            SWIG_PYTHON_THREAD_END_ALLOW;
         }
         return false;
     };

src/swig-0_27_7/basicio_wrap.cxx

@@ -4434,9 +4434,7 @@ class DataContext {
         parent(parent), isWriteable(isWriteable), mapped(false) {};
     ~DataContext() {
         if (mapped) {
-            SWIG_PYTHON_THREAD_BEGIN_ALLOW;
             parent->munmap();
-            SWIG_PYTHON_THREAD_END_ALLOW;
             parent->close();
         }
     };
@@ -4457,11 +4455,9 @@ class DataContext {
     };
     bool __exit__(PyObject* exc_type, PyObject* exc_val, PyObject* exc_tb) {
         if (mapped) {
-            SWIG_PYTHON_THREAD_BEGIN_ALLOW;
             parent->munmap();
             mapped = false;
             parent->close();
-            SWIG_PYTHON_THREAD_END_ALLOW;
         }
         return false;
     };
@@ -4861,7 +4857,11 @@ SWIGINTERN PyObject *_wrap_delete_DataContext(PyObject *self, PyObject *args) {
   arg1 = reinterpret_cast< DataContext * >(argp1);
   {
     try {
-      delete arg1;
+      {
+        SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+        delete arg1;
+        SWIG_PYTHON_THREAD_END_ALLOW;
+      }
     }
     catch(std::exception const& e) {
       _set_python_exception();
@@ -4928,7 +4928,11 @@ SWIGINTERN PyObject *_wrap_DataContext___exit__(PyObject *self, PyObject *args)
   arg4 = obj3;
   {
     try {
-      result = (bool)(arg1)->__exit__(arg2,arg3,arg4);
+      {
+        SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+        result = (bool)(arg1)->__exit__(arg2,arg3,arg4);
+        SWIG_PYTHON_THREAD_END_ALLOW;
+      }
     }
     catch(std::exception const& e) {
       _set_python_exception();
@@ -5757,15 +5761,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_ioType(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicIo_ioType" "', argument " "1"" of type '" "Exiv2::BasicIo *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::BasicIo * >(argp1);
-  {
-    try {
-      result = (char *)Exiv2_BasicIo_ioType(arg1);
-    }
-    catch(std::exception const& e) {
-      _set_python_exception();
-      SWIG_fail;
-    }
-  }
+  result = (char *)Exiv2_BasicIo_ioType(arg1);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail:

src/swig-0_28_5/basicio_wrap.cxx

@@ -4435,9 +4435,7 @@ class DataContext {
         parent(parent), isWriteable(isWriteable), mapped(false) {};
     ~DataContext() {
         if (mapped) {
-            SWIG_PYTHON_THREAD_BEGIN_ALLOW;
             parent->munmap();
-            SWIG_PYTHON_THREAD_END_ALLOW;
             parent->close();
         }
     };
@@ -4458,11 +4456,9 @@ class DataContext {
     };
     bool __exit__(PyObject* exc_type, PyObject* exc_val, PyObject* exc_tb) {
         if (mapped) {
-            SWIG_PYTHON_THREAD_BEGIN_ALLOW;
             parent->munmap();
             mapped = false;
             parent->close();
-            SWIG_PYTHON_THREAD_END_ALLOW;
         }
         return false;
     };
@@ -4966,7 +4962,11 @@ SWIGINTERN PyObject *_wrap_delete_DataContext(PyObject *self, PyObject *args) {
   arg1 = reinterpret_cast< DataContext * >(argp1);
   {
     try {
-      delete arg1;
+      {
+        SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+        delete arg1;
+        SWIG_PYTHON_THREAD_END_ALLOW;
+      }
     }
     catch(std::exception const& e) {
       _set_python_exception();
@@ -5033,7 +5033,11 @@ SWIGINTERN PyObject *_wrap_DataContext___exit__(PyObject *self, PyObject *args)
   arg4 = obj3;
   {
     try {
-      result = (bool)(arg1)->__exit__(arg2,arg3,arg4);
+      {
+        SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+        result = (bool)(arg1)->__exit__(arg2,arg3,arg4);
+        SWIG_PYTHON_THREAD_END_ALLOW;
+      }
     }
     catch(std::exception const& e) {
       _set_python_exception();
@@ -6025,15 +6029,7 @@ SWIGINTERN PyObject *_wrap_BasicIo_ioType(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BasicIo_ioType" "', argument " "1"" of type '" "Exiv2::BasicIo *""'"); 
   }
   arg1 = reinterpret_cast< Exiv2::BasicIo * >(argp1);
-  {
-    try {
-      result = (char *)Exiv2_BasicIo_ioType(arg1);
-    }
-    catch(std::exception const& e) {
-      _set_python_exception();
-      SWIG_fail;
-    }
-  }
+  result = (char *)Exiv2_BasicIo_ioType(arg1);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail: