Changeset 13466

Timestamp:

Sep 13, 2019 12:06:16 PM (3 months ago)

Author:

randersson

Message:

#5819 Fixed issues with metaclasses from 2to3 changes

Location:

branches/dev-5819/Python/src/pyjmi/optimization

Files:

• greybox.py (modified) (1 diff)
• polynomial.py (modified) (2 diffs)
• realtimecontrol.py (modified) (2 diffs)

branches/dev-5819/Python/src/pyjmi/optimization/greybox.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright (C) 2015 Modelon AB
-#
-#    This program 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, version 3 of the License.
-#
-#    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (C) 2015 Modelon AB, all rights reserved.
 from pyjmi.optimization.casadi_collocation import ExternalData
 

branches/dev-5819/Python/src/pyjmi/optimization/polynomial.py

@@ -25 +25 @@
 import numpy.linalg
 import scipy.special as SP
+from six import with_metaclass
 try:
     import casadi
@@ -31 +32 @@
         'Could not find CasADi package, aborting.')
 
-class LocalPol(object, metaclass=abc.ABCMeta):
+class LocalPol(object, with_metaclass(abc.ABCMeta)):
     
     """

branches/dev-5819/Python/src/pyjmi/optimization/realtimecontrol.py

@@ -16 +16 @@
 from pymodelica import compile_fmu
 from pyfmi import load_fmu
-
+from six import with_metaclass
 
 class ParameterChanges(object):
@@ -82 +82 @@
       
       
-class RealTimeBase(object, metaclass=ABCMeta):
+class RealTimeBase(object, with_metaclass(metaclass=ABCMeta)):
     
     def __init__(self, dt, t_final, start_values, output_names,