@@ -42,7 +42,10 @@ class Term(ops.Term):
42
42
env : PyTablesScope
43
43
44
44
def __new__ (cls , name , env , side = None , encoding = None ):
45
- klass = Constant if not isinstance (name , str ) else cls
45
+ if isinstance (name , str ):
46
+ klass = cls
47
+ else :
48
+ klass = Constant
46
49
return object .__new__ (klass )
47
50
48
51
def __init__ (self , name , env : PyTablesScope , side = None , encoding = None ):
@@ -83,6 +86,7 @@ class BinOp(ops.BinOp):
83
86
84
87
op : str
85
88
queryables : Dict [str , Any ]
89
+ condition : Optional [str ]
86
90
87
91
def __init__ (self , op : str , lhs , rhs , queryables : Dict [str , Any ], encoding ):
88
92
super ().__init__ (op , lhs , rhs )
@@ -184,10 +188,8 @@ def convert_value(self, v) -> "TermValue":
184
188
185
189
def stringify (value ):
186
190
if self .encoding is not None :
187
- encoder = partial (pprint_thing_encoded , encoding = self .encoding )
188
- else :
189
- encoder = pprint_thing
190
- return encoder (value )
191
+ return pprint_thing_encoded (value , encoding = self .encoding )
192
+ return pprint_thing (value )
191
193
192
194
kind = ensure_decoded (self .kind )
193
195
meta = ensure_decoded (self .meta )
@@ -257,9 +259,11 @@ def __repr__(self) -> str:
257
259
def invert (self ):
258
260
""" invert the filter """
259
261
if self .filter is not None :
260
- f = list (self .filter )
261
- f [1 ] = self .generate_filter_op (invert = True )
262
- self .filter = tuple (f )
262
+ self .filter = (
263
+ self .filter [0 ],
264
+ self .generate_filter_op (invert = True ),
265
+ self .filter [2 ],
266
+ )
263
267
return self
264
268
265
269
def format (self ):
0 commit comments