Fix #166

dputhier · Nov 2, 2021 · 9390ee5 · 9390ee5
1 parent 3490f4b
commit 9390ee5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/pygtftk/gtf_interface.py b/pygtftk/gtf_interface.py
@@ -30,10 +30,10 @@
 from pyparsing import Optional
 from pyparsing import ParseResults
 from pyparsing import Word
+from pyparsing import infixNotation
 from pyparsing import nums
 from pyparsing import oneOf
 from pyparsing import opAssoc
-from pyparsing import operatorPrecedence
 
 import pygtftk
 import pygtftk.utils
@@ -925,7 +925,7 @@ def tail(self, nb=6, returned=False):
             return msg
         else:
             print(msg)
-            
+
     def __repr__(self):
         """
         Returns a printable representation of the GTF object.
@@ -2063,9 +2063,9 @@ def _embed(s, l, t):
         group_1 = identifier + comparison_operator + value
         group_2 = value + comparison_operator + identifier
         comparison = group_1 | group_2
-        boolean_expr = operatorPrecedence(comparison,
-                                          [(and_operator, 2, opAssoc.LEFT),
-                                           (or_operator, 2, opAssoc.LEFT)])
+        boolean_expr = infixNotation(comparison,
+                                     [(and_operator, 2, opAssoc.LEFT),
+                                      (or_operator, 2, opAssoc.LEFT)])
 
         boolean_expr_par = lparen + boolean_expr + rparen
 

diff --git a/pygtftk/utils.py b/pygtftk/utils.py
@@ -1,22 +1,22 @@
 """A set of useful functions."""
 
 import datetime
+import glob
 import io
+import os
+import random
 import re
+import string
 import sys
 import time
 from collections import defaultdict, OrderedDict
+from distutils.spawn import find_executable
 from subprocess import PIPE
 from subprocess import Popen
+from tempfile import NamedTemporaryFile, mkdtemp
 
-import glob
-import os
-import random
-import string
-from distutils.spawn import find_executable
-from pyparsing import Literal, CaselessLiteral, oneOf, nums, Word, Combine, Optional, operatorPrecedence, opAssoc, \
+from pyparsing import Literal, CaselessLiteral, oneOf, nums, Word, Combine, Optional, infixNotation, opAssoc, \
     Forward, ParseException
-from tempfile import NamedTemporaryFile, mkdtemp
 
 import pygtftk
 
@@ -1214,9 +1214,9 @@ def check_boolean_exprs(exprs=None, operand=(), send_error=True):
     group_1 = identifier + comparison_operator + value
     group_2 = value + comparison_operator + identifier
     comparison = group_1 | group_2
-    boolean_expr = operatorPrecedence(comparison,
-                                      [(and_operator, 2, opAssoc.LEFT),
-                                       (or_operator, 2, opAssoc.LEFT)])
+    boolean_expr = infixNotation(comparison,
+                                 [(and_operator, 2, opAssoc.LEFT),
+                                  (or_operator, 2, opAssoc.LEFT)])
 
     boolean_expr_par = lparen + boolean_expr + rparen