openmolcas: fix pyparsing >= 3.11 compatibility
This commit is contained in:
parent
777255264c
commit
9ad625fdfa
2 changed files with 40 additions and 0 deletions
|
@ -59,6 +59,9 @@ stdenv.mkDerivation {
|
|||
|
||||
# Required for a local QCMaquis build
|
||||
./qcmaquis.patch
|
||||
|
||||
# PyParsing >= 3.11 compatibility, can be removed on next release
|
||||
./pyparsing.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
diff --git a/Tools/pymolcas/emil_grammar.py b/Tools/pymolcas/emil_grammar.py
|
||||
index acbbae8..509c56f 100644
|
||||
--- a/Tools/pymolcas/emil_grammar.py
|
||||
+++ b/Tools/pymolcas/emil_grammar.py
|
||||
@@ -15,6 +15,14 @@
|
||||
|
||||
from __future__ import (unicode_literals, division, absolute_import, print_function)
|
||||
|
||||
+try:
|
||||
+ u = unicode
|
||||
+ del u
|
||||
+ py2 = True
|
||||
+except NameError:
|
||||
+ pass
|
||||
+
|
||||
+
|
||||
from re import sub
|
||||
from pyparsing import *
|
||||
|
||||
@@ -24,6 +32,8 @@ def chomp(s):
|
||||
|
||||
def chompAction(s, l, t):
|
||||
try:
|
||||
+ if (py2):
|
||||
+ pass
|
||||
return list(map(lambda s: chomp(unicode(s)), t))
|
||||
except NameError:
|
||||
return list(map(chomp, t))
|
||||
@@ -33,6 +43,8 @@ def removeEMILEnd(s):
|
||||
|
||||
def removeEMILEndAction(s, l, t):
|
||||
try:
|
||||
+ if (py2):
|
||||
+ pass
|
||||
return list(map(lambda s: removeEMILEnd(unicode(s)), t))
|
||||
except NameError:
|
||||
return list(map(removeEMILEnd, t))
|
Loading…
Reference in a new issue