Fix exception handling SWIG interface for Python 3

Jürgen Knödlseder
1 parent f8591ef9
Showing 5 changed files with 54 additions and 10 deletions
ChangeLog
NEWS
README.md
pyext/GException.i
pyext/GTestSuite.i
-2016-07-19  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2016-07-22  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
         * Version 1.1.0 released
         =========================
+        Fix exception handling SWIG interface for Python 3
         Write same XML element names than those that were read (#1820)
         Rename spatial model components (#1818)
         Fix consistency problem in GCTABackground3D (#1815)
@@ -2,7 +2,7 @@ New Features and Important Changes in GammaLib 1.1.0
 Author(s) : Juergen Knoedlseder
-21 July 2016
+22 July 2016
 1. Introduction
@@ -358,6 +358,11 @@ be needed for response computation.
 A GTestSuite::test_value() method has been added for strings to simplify the
 writing of test cases for string comparison (#1772).
+The Python interface for handling of SWIG exceptions is now also compatible
+with Python 3, hence there should be no longer "basic_string ::_S_construct
+null not valid" messages when errors occur in the SWIG interface under
+Python 3.
+
 18. Multi-wavelength interface
 ------------------------------
 GammaLib information
 ====================
-* Version: 1.1.0.dev1 (19 July 2016)
+* Version: 1.1.0.dev1 (22 July 2016)
 * Author:  Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu)
 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=gammalib-integrate-os)](https://cta-jenkins.irap.omp.eu/job/gammalib-integrate-os/)
 /***************************************************************************
  *                      GException.i - exception handler                   *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2008-2012 by Juergen Knoedlseder                         *
+ *  copyright (C) 2008-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -36,10 +36,22 @@
     catch (const GException::out_of_range& e) {
         SWIG_exception(SWIG_IndexError, e.what());
     }
-    catch (const GExceptionHandler& e) {
+    catch (const GException::invalid_value& e) {
+        SWIG_exception(SWIG_ValueError, e.what());
+    }
+    catch (const GException::invalid_argument& e) {
+        SWIG_exception(SWIG_ValueError, e.what());
+    }
+    catch (const GException::fits_error& e) {
+        SWIG_exception(SWIG_IOError, e.what());
+    }
+    catch (const GException& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
     }
     catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
     }
+    catch (...) {
+        SWIG_exception(SWIG_RuntimeError, "unknown exception");
+    }
 }
@@ -62,11 +62,37 @@ public:
                 // Extract message strings
                 PyObject *py_type  = PyObject_Str(type);
                 PyObject *py_value = PyObject_Str(value);
-                char     *c_type   = PyString_AsString(py_type);
-                char     *c_value  = PyString_AsString(py_value);
-                m_message += std::string(c_type);
-                m_message += "\n";
-                m_message += std::string(c_value);
+                char     *c_type   = NULL;
+                char     *c_value  = NULL;
+                if (PyUnicode_Check(py_type)) {
+                    PyObject* temp_bytes = PyUnicode_AsEncodedString(py_type,
+                                                                     "utf-8",
+                                                                     "Error ~");
+                    if (temp_bytes != NULL) {
+                        c_type = PyBytes_AS_STRING(temp_bytes);
+                    }
+                }
+                else if (py_type != NULL) {
+                    c_type = PyBytes_AS_STRING(py_type);
+                }
+                if (c_type != NULL) {
+                    m_message += std::string(c_type);
+                    m_message += "\n";
+                }
+                if (PyUnicode_Check(py_value)) {
+                    PyObject* temp_bytes = PyUnicode_AsEncodedString(py_value,
+                                                                     "utf-8",
+                                                                     "Error ~");
+                    if (temp_bytes != NULL) {
+                        c_value = PyBytes_AS_STRING(temp_bytes);
+                    }
+                }
+                else if (py_value != NULL) {
+                    c_value = PyBytes_AS_STRING(py_value);
+                }
+                if (c_value != NULL) {
+                    m_message += std::string(c_value);
+                }
                 Py_DECREF(py_type);
                 Py_DECREF(py_value);
             }