(SOFTWARE-6113) Don't eval() without a context argument.

Author: Todd-L-Miller

src/htcondorce/info_query.py

@@ -23,7 +23,7 @@ def __init__(self, ce_ad, catalog_entry):
 
         for cekey in ['OSG_Resource', 'OSG_ResourceGroup', 'OSG_BatchSystems']:
             self[cekey] = ce_ad[cekey]
-        self['grid_resource'] = ce_ad['grid_resource'].eval()
+        self['grid_resource'] = ce_ad['grid_resource'].eval(ce_ad)
 
         for catkey, catval in catalog_entry.items():
             if isinstance(catval, classad.ClassAd):

src/htcondorce/web.py

@@ -132,7 +132,7 @@ def ad_to_json(ad):
     for (key, val) in ad.items():
         # Evaluate Condor expressions
         if isinstance(val, classad.ExprTree):
-            val = val.eval()
+            val = val.eval(ad)
         result[key] = val
     # Unfortunately, classad.Value.Undefined is of type int,
     # and json.dumps() converts it to "2".

src/htcondorce/web_utils.py

@@ -94,7 +94,7 @@ def get_schedd_statuses(environ={}):
         if 'Status' not in ad:
             results[ad['Name']] = 'Unknown'
         else:
-            results[ad['Name']] = ad['Status'].eval()
+            results[ad['Name']] = ad['Status'].eval(ad)
 
     return results
 
@@ -112,7 +112,7 @@ def ad_to_json(ad):
         if classad.ExprTree("%s =?= UNDEFINED" % key).eval(ad):
             result[key] = {"_condor_type": "expr", "expr": val_expr.__repr__()}
         else:
-            val = val_expr.eval()
+            val = val_expr.eval(ad)
             if isinstance(val, list) or isinstance(val, dict):
                 result[key] = {"_condor_type": "expr", "expr": val_expr.__repr__()}
             else: