Skip to content

GitLab

Unverified Commit 418855e6 authored by peastman's avatar peastman Committed by GitHub
Browse files

Fix errors on Python 3.9 (#2888) 

* Fix errors on Python 3.9

* Revert changes to travis builds
parent fce26088
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
wrappers/generateWrappers.py
View file @ 418855e6
...@@ -235,7 +235,7 @@ class CHeaderGenerator(WrapperGenerator): ...@@ -235,7 +235,7 @@ class CHeaderGenerator(WrapperGenerator):
shortClassName = stripOpenMMPrefix(className) shortClassName = stripOpenMMPrefix(className)
typeName = convertOpenMMPrefix(className) typeName = convertOpenMMPrefix(className)
destructorName = '~'+shortClassName destructorName = '~'+shortClassName
isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.getiterator('memberdef')) isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.iter('memberdef'))
if not isAbstract: if not isAbstract:
# Write constructors # Write constructors
...@@ -496,7 +496,7 @@ class CSourceGenerator(WrapperGenerator): ...@@ -496,7 +496,7 @@ class CSourceGenerator(WrapperGenerator):
shortClassName = stripOpenMMPrefix(className) shortClassName = stripOpenMMPrefix(className)
typeName = convertOpenMMPrefix(className) typeName = convertOpenMMPrefix(className)
destructorName = '~'+shortClassName destructorName = '~'+shortClassName
isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.getiterator('memberdef')) isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.iter('memberdef'))
if not isAbstract: if not isAbstract:
# Write constructors # Write constructors
...@@ -959,7 +959,7 @@ class FortranHeaderGenerator(WrapperGenerator): ...@@ -959,7 +959,7 @@ class FortranHeaderGenerator(WrapperGenerator):
shortClassName = stripOpenMMPrefix(className) shortClassName = stripOpenMMPrefix(className)
typeName = convertOpenMMPrefix(className) typeName = convertOpenMMPrefix(className)
destructorName = '~'+shortClassName destructorName = '~'+shortClassName
isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.getiterator('memberdef')) isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.iter('memberdef'))
if not isAbstract: if not isAbstract:
# Write constructors # Write constructors
...@@ -1529,7 +1529,7 @@ class FortranSourceGenerator(WrapperGenerator): ...@@ -1529,7 +1529,7 @@ class FortranSourceGenerator(WrapperGenerator):
shortClassName = stripOpenMMPrefix(className) shortClassName = stripOpenMMPrefix(className)
typeName = convertOpenMMPrefix(className) typeName = convertOpenMMPrefix(className)
destructorName = '~'+shortClassName destructorName = '~'+shortClassName
isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.getiterator('memberdef')) isAbstract = any('virt' in method.attrib and method.attrib['virt'] == 'pure-virtual' for method in classNode.iter('memberdef'))
if not isAbstract: if not isAbstract:
# Write constructors # Write constructors
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment