Mercurial > pytave
changeset 139:b12908ffa6df
maint: Use Octave style for file copyright block, delete editor footer
* arrayobjectdefs.h, exceptions.{cc,h}, octave_to_python.{cc,h}, py.cc,
pytave.cc, python_to_octave.{cc,h}, package/__init__.py, package/pytave.py:
Use consistent Octave style for file copyright block. Delete editor footer.
* ChangeLog, test/test.py: Delete editor footer.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 04 Apr 2016 17:16:58 -0700 |
| parents | 8b9b31acf632 |
| children | d9fa0b60e889 |
| files | ChangeLog arrayobjectdefs.h exceptions.cc exceptions.h octave_to_python.cc octave_to_python.h package/__init__.py package/pytave.py py.cc pytave.cc python_to_octave.cc python_to_octave.h test/test.py |
| diffstat | 13 files changed, 186 insertions(+), 264 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Apr 04 16:13:03 2016 -0700 +++ b/ChangeLog Mon Apr 04 17:16:58 2016 -0700 @@ -327,8 +327,3 @@ First launchpad.net check in. -Local Variables: -coding: utf-8 -fill-column: 74 -End: -vim: set textwidth=74 noexpandtab :
--- a/arrayobjectdefs.h Mon Apr 04 16:13:03 2016 -0700 +++ b/arrayobjectdefs.h Mon Apr 04 17:16:58 2016 -0700 @@ -1,21 +1,24 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson + +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 your extension does not reside in a single file, there is an * additional step that is necessary. Be sure to define the symbol @@ -31,13 +34,3 @@ #include <Python.h> #include <numpy/npy_no_deprecated_api.h> #include <numpy/arrayobject.h> - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/exceptions.cc Mon Apr 04 16:13:03 2016 -0700 +++ b/exceptions.cc Mon Apr 04 17:16:58 2016 -0700 @@ -1,21 +1,24 @@ /* - * Copyright 2008 David Grundberg, Håkan Fors Nilsson - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson + +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/>. + +*/ #include <boost/python.hpp> #include "exceptions.h" @@ -29,13 +32,3 @@ PyObject *variable_name_exception::excclass = NULL; } - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/exceptions.h Mon Apr 04 16:13:03 2016 -0700 +++ b/exceptions.h Mon Apr 04 17:16:58 2016 -0700 @@ -1,21 +1,24 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson + +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/>. + +*/ #ifndef PYTAVE_EXCEPTIONS_H #define PYTAVE_EXCEPTIONS_H @@ -136,13 +139,3 @@ } #endif /* PYTAVE_EXCEPTIONS_H */ - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/octave_to_python.cc Mon Apr 04 16:13:03 2016 -0700 +++ b/octave_to_python.cc Mon Apr 04 17:16:58 2016 -0700 @@ -1,22 +1,25 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * Copyright 2009 VZLU Prague - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson +Copyright (C) 2009 VZLU Prague + +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 (HAVE_CONFIG_H) # include <config.h> @@ -318,13 +321,3 @@ python_tuple = tuple(seq); } } - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/octave_to_python.h Mon Apr 04 16:13:03 2016 -0700 +++ b/octave_to_python.h Mon Apr 04 17:16:58 2016 -0700 @@ -1,21 +1,24 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson + +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/>. + +*/ #ifndef OCTAVE_TO_PYTHON_H #define OCTAVE_TO_PYTHON_H @@ -28,13 +31,3 @@ } #endif /* OCTAVE_TO_PYTHON_H */ - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/package/__init__.py Mon Apr 04 16:13:03 2016 -0700 +++ b/package/__init__.py Mon Apr 04 17:16:58 2016 -0700 @@ -1,30 +1,22 @@ # -*- coding:utf-8 -*- # -# Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson +# Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson # # 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. +# 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. +# 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. If not, see <http://www.gnu.org/licenses/>. +# along with Pytave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. import _pytave from pytave import * - -# Emacs -# Local Variables: -# fill-column:70 -# coding:utf-8 -# indent-tabs-mode:t -# tab-width:3 -# End: -# vim: set textwidth=70 noexpandtab tabstop=3 :
--- a/package/pytave.py Mon Apr 04 16:13:03 2016 -0700 +++ b/package/pytave.py Mon Apr 04 17:16:58 2016 -0700 @@ -1,22 +1,23 @@ # -*- coding:utf-8 -*- # -# Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson -# Copyright 2009 Jaroslav Hajek, VZLU Prague +# Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson +# Copyright (C) 2009 Jaroslav Hajek, VZLU Prague # # 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. +# 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. +# 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. If not, see <http://www.gnu.org/licenses/>. +# along with Pytave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. """Python to Octave bridge"""
--- a/py.cc Mon Apr 04 16:13:03 2016 -0700 +++ b/py.cc Mon Apr 04 17:16:58 2016 -0700 @@ -4,9 +4,9 @@ This file is part of Pytave. -Pytave is free software; you can redistribute it and/or modify it +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 +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
--- a/pytave.cc Mon Apr 04 16:13:03 2016 -0700 +++ b/pytave.cc Mon Apr 04 17:16:58 2016 -0700 @@ -1,22 +1,25 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * Copyright 2009 Jaroslav Hajek, VZLU Prague - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson +Copyright (C) 2009 Jaroslav Hajek, VZLU Prague + +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 (HAVE_CONFIG_H) # include <config.h> @@ -422,13 +425,3 @@ pytave::variable_name_exception::translate_exception); } /* }}} */ - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/python_to_octave.cc Mon Apr 04 16:13:03 2016 -0700 +++ b/python_to_octave.cc Mon Apr 04 17:16:58 2016 -0700 @@ -1,22 +1,25 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * Copyright 2009 VZLU Prague - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson +Copyright (C) 2009 VZLU Prague + +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 (HAVE_CONFIG_H) # include <config.h> @@ -440,13 +443,3 @@ } } } - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/python_to_octave.h Mon Apr 04 16:13:03 2016 -0700 +++ b/python_to_octave.h Mon Apr 04 17:16:58 2016 -0700 @@ -1,21 +1,24 @@ /* - * Copyright 2008 David Grundberg, HÃ¥kan Fors Nilsson - * - * 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. If not, see <http://www.gnu.org/licenses/>. - */ + +Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson + +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/>. + +*/ #ifndef PYTHON_TO_OCTAVE_H #define PYTHON_TO_OCTAVE_H @@ -28,13 +31,3 @@ } #endif /* PYTHON_TO_OCTAVE_H */ - -/* Emacs - * Local Variables: - * fill-column:79 - * coding:utf-8 - * indent-tabs-mode:nil - * c-basic-offset:3 - * End: - * vim: set textwidth=79 expandtab shiftwidth=3 : - */
--- a/test/test.py Mon Apr 04 16:13:03 2016 -0700 +++ b/test/test.py Mon Apr 04 17:16:58 2016 -0700 @@ -317,13 +317,3 @@ def func(): del pytave.globals["globalvariable"] testexception(KeyError, lambda: func()) - -# Emacs -# Local Variables: -# fill-column:70 -# coding:utf-8 -# indent-tabs-mode:t -# tab-width:8 -# python-indent:8 -# End: -# vim: set textwidth=70 noexpandtab tabstop=8 :