Skip to content
Snippets Groups Projects
Commit 6915749d authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[py-casadi] fix PLIST

and add patch-ab to fix python syntax
parent 2496c4e9
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
ORG= casadi
NAME= casadi
VERSION= 3.5.5
PKGREVISION= 1
PKGREVISION= 2
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
......
......@@ -125,7 +125,7 @@ include/casadi/valgrind-casadi.supp
include/casadi/valgrind-python.supp
lib/cmake/casadi/casadi-config-version.cmake
lib/cmake/casadi/casadi-config.cmake
lib/cmake/casadi/casadi-targets-debug.cmake
lib/cmake/casadi/casadi-targets-release.cmake
lib/cmake/casadi/casadi-targets.cmake
lib/libcasadi.so
lib/libcasadi.so.3.6
......
......@@ -2,3 +2,4 @@ SHA1 (casadi-3.5.5.tar.gz) = f0307c8b2e86c2fa9217236d09fd7561cee158f5
RMD160 (casadi-3.5.5.tar.gz) = c415b5ec1dea4116d2f2cc4685bedd2c20786881
Size (casadi-3.5.5.tar.gz) = 3672153 bytes
SHA1 (patch-aa) = 3ea7f5ce1ec50cd823cf19bcafb1b9781bfb33c4
SHA1 (patch-ab) = 2cf69a74399cacc3a979fb732440861d613d39d9
--- swig/python/tools/structure.py.orig 2020-09-05 08:35:10.000000000 +0200
+++ swig/python/tools/structure.py 2021-02-10 12:46:57.341485201 +0100
@@ -267,8 +267,7 @@
raise Exception("I don't know what to do with this: %s" % str(p))
except Exception as e:
exc_class, exc, tb = sys.exc_info()
- new_exc = Exception("Error occured in entry context with powerIndex %s, at canonicalIndex %s:\n%s" % (str(powerIndex),str(canonicalIndex),str(e)))
- raise new_exc.__class__, new_exc, tb
+ raise Exception("Error occured in entry context with powerIndex %s, at canonicalIndex %s:\n%s" % (str(powerIndex),str(canonicalIndex),str(e)))
class Structure(object):
def __init__(self,entries,order=None):
@@ -425,8 +424,7 @@
raise Exception("I don't know what to do with this: %s" % str(p))
except Exception as e:
exc_class, exc, tb = sys.exc_info()
- new_exc = Exception("Error occured in struct context with powerIndex %s, at canonicalIndex %s:\n%s" % (str(powerIndex),str(canonicalIndex),str(e)))
- raise new_exc.__class__, new_exc, tb
+ raise Exception("Error occured in struct context with powerIndex %s, at canonicalIndex %s:\n%s" % (str(powerIndex),str(canonicalIndex),str(e)))
# Casadi-dependent Structure framework
@@ -580,8 +578,7 @@
raise Exception("Cannot handle type '%s'." % entry.type)
except Exception as e:
exc_class, exc, tb = sys.exc_info()
- new_exc = Exception("Error in powerIndex slicing for canonicalIndex %s:\n%s" % (str(canonicalIndex),str(e)))
- raise new_exc.__class__, new_exc, tb
+ raise Exception("Error in powerIndex slicing for canonicalIndex %s:\n%s" % (str(canonicalIndex),str(e)))
else:
raise Exception("Canonical index %s does not exist." % str(canonicalIndex))
@@ -611,8 +608,7 @@
raise CompatibilityException("Error in canonicalIndex slicing for %s: Incompatible types in a[i]=b with a %s (%s) and b %s (%s) and i %s (%s). Error: %s" % (str(canonicalIndex),str(self.master),str(__builtin__.type(self.master)),str(payload),str(__builtin__.type(payload)),str(i),str(__builtin__.type(i)),str(e)))
except Exception as e:
exc_class, exc, tb = sys.exc_info()
- new_exc = Exception("Error in powerIndex slicing for canonicalIndex %s:\n%s" % (str(canonicalIndex),str(e)))
- raise new_exc.__class__, new_exc, tb
+ raise Exception("Error in powerIndex slicing for canonicalIndex %s:\n%s" % (str(canonicalIndex),str(e)))
else:
raise Exception("Canonical index %s does not exist." % str(canonicalIndex))
@@ -626,8 +622,7 @@
raise CompatibilityException("Error in canonicalIndex slicing for %s: Incompatible types in a[i]=b with a %s and b %s." % (str(canonicalIndex),str(self.master),str(payload)))
except Exception as e:
exc_class, exc, tb = sys.exc_info()
- new_exc = Exception("Error in powerIndex slicing for canonicalIndex %s:\n %s" % (str(canonicalIndex),str(e)))
- raise new_exc.__class__, new_exc, tb
+ raise Exception("Error in powerIndex slicing for canonicalIndex %s:\n %s" % (str(canonicalIndex),str(e)))
class MasterGettable:
@properGetitem
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment