openstack/yaql
Code Issues Proposed changes

Merge "Stop using deprecated 'message' attribute in Exception"

Browse Source
This commit is contained in:
Zuul 2024-01-09 08:38:42 +00:00 committed by Gerrit Code Review
commit cf75637fe4
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yaql/cli/cli_functions.py
View File

@ -72,7 +72,7 @@ def main(context, show_tokens, parser):
if ex.position:
pointer_string = (" " * (ex.position + len(PROMPT))) + '^'
print(pointer_string)
print(ex.message)
print(str(ex))
continue
try:
res = expr.evaluate(context=context)
@ -90,8 +90,8 @@ def load_data(data_file, context):
return
try:
data = json.loads(json_str)
except Exception as e:
print('Unable to parse data: ' + e.message)
except ValueError as e:
print('Unable to parse data: ' + str(e))
return
context['$'] = utils.convert_input_data(data)
print('Data from file {0} loaded into context'.format(data_file))

20
yaql/tests/test_miscellaneous.py
View File

@ -12,7 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import tempfile
from yaql.cli.cli_functions import load_data
from yaql.language import exceptions
from yaql.language import specs
from yaql.language import yaqltypes
@ -90,3 +92,21 @@ class TestMiscellaneous(yaql.tests.TestCase):
self.eval, 'baz1(null)')
self.assertFalse(self.eval('baz2($)', data=iter([1, 2])))
self.assertTrue(self.eval('baz2(null)'))
def test_load_data(self):
context = {}
self.assertIsNone(load_data('/temporarydir/some_random_filename',
context))
self.assertEqual(context, {})
with tempfile.NamedTemporaryFile() as f:
f.write(b'This is not JSON')
f.flush()
self.assertIsNone(load_data(f.name, context))
self.assertEqual(context, {})
with tempfile.NamedTemporaryFile() as f:
f.write(b'{"foo": "bar"}')
f.flush()
self.assertIsNone(load_data(f.name, context))
self.assertEqual(context['$'], {"foo": "bar"})