view oct-py-object.h @ 423:6b9de18b4bdd

Eliminate remaining custom exception handling in favor of Octave errors * oct-py-error.cc, oct-py-error.h (pytave::error_python_exception): New function to generate an Octave error from an active Python error condition, based on pytave::fetch_exception_message. * oct-py-eval.cc (pytave::py_call_function, pytave::py_run_string_safe): Use it. * oct-py-types.cc (pytave::make_py_dict): Likewise. * oct-py-util.cc (pytave::py_objstore): Likewise. * pycall.cc (Fpycall): Remove exception handling logic. * pyeval.cc (Fpyeval): Likewise. * pyexec.cc (Fpyexec): Likewise. * exceptions.cc, exceptions.h: Delete. * Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Remove them.
author Mike Miller <mtmiller@octave.org>
date Thu, 04 May 2017 21:15:07 -0700
parents 3644df6564bc
children
line wrap: on
line source

/*

Copyright (C) 2017 Abhinav Tripathi

This file is part of Pytave.

Pytave is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 3 of the License, or (at your
option) any later version.

Pytave is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
for more details.

You should have received a copy of the GNU General Public License
along with Pytave; see the file COPYING.  If not, see
<http://www.gnu.org/licenses/>.

*/

#if ! defined (pytave_oct_py_object_h)
#define pytave_oct_py_object_h 1

#include <Python.h>

namespace pytave
{

  class python_object
  {
  public:
    python_object (PyObject *obj = nullptr)
    {
      pyobj = obj;
      isowned = pyobj != nullptr;
    }

    python_object (const python_object& oth)
    {
      pyobj = oth.pyobj;
      isowned = oth.isowned;
      if (isowned)
        Py_INCREF (pyobj);
    }

    ~python_object ()
    {
      if (isowned)
        Py_DECREF (pyobj);
    }

    python_object&
    operator = (const python_object& oth)
    {
      if (isowned)
        Py_DECREF (pyobj);
      pyobj = oth.pyobj;
      isowned = oth.isowned;
      if (isowned)
        Py_INCREF (pyobj);
      return *this;
    }

    python_object&
    operator = (PyObject *obj)
    {
      if (isowned)
        Py_DECREF (pyobj);
      pyobj = obj;
      isowned = pyobj != nullptr;
      if (isowned)
        Py_INCREF (pyobj);
      return *this;
    }

    operator bool () const
    {
      return isowned;
    }

    operator PyObject * ()
    {
      return pyobj;
    }

    bool
    is_none () const
    {
      return pyobj && pyobj == Py_None;
    }

    PyObject *
    release ()
    {
      isowned = false;
      PyObject *ret = pyobj;
      pyobj = nullptr;
      return ret;
    }

  private:
    PyObject *pyobj;
    bool isowned;
  };

}

#endif