9e8cec8910
There were several issues with Unicode support in MuranoPL after switch to yaql 1.0. Each of those issues caused any deploy to fail if it used to do anything with non-ASCII strings Fixed issues are: * Unicode strings should not be encoded to str types anymore. yaql 1.0 has native support for the Unicode and fails when non- ASCII chars encounter in str expressions. Also tests for Unicode support are now part of the yaql * Traces of execution were logged not as Unicode strings. Because those traces contain parameter values ant function return value logging failed when any of above contained non-ASCII chars * Stack trace logging failed when frame expression contained non-ASCII chars * Exception messages could not contain non-ASCII chars Also Logging API was not Unicode ready Change-Id: Ief0b45f15669c5f8ee74fd6ff41fa5bc39c9500b Closes-Bug: #1494275
83 lines
2.7 KiB
Python
83 lines
2.7 KiB
Python
# Copyright (c) 2014 Mirantis, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import re
|
|
import types
|
|
|
|
from yaql.language import exceptions as yaql_exceptions
|
|
from yaql.language import expressions
|
|
|
|
from murano.dsl import constants
|
|
from murano.dsl import dsl_types
|
|
from murano.dsl import yaql_integration
|
|
|
|
|
|
class YaqlExpression(dsl_types.YaqlExpression):
|
|
def __init__(self, expression, version):
|
|
self._version = version
|
|
if isinstance(expression, types.StringTypes):
|
|
self._expression = unicode(expression)
|
|
self._parsed_expression = yaql_integration.parse(
|
|
self._expression, version)
|
|
self._file_position = None
|
|
elif isinstance(expression, YaqlExpression):
|
|
self._expression = expression._expression
|
|
self._parsed_expression = expression._parsed_expression
|
|
self._file_position = expression._file_position
|
|
elif isinstance(expression, expressions.Statement):
|
|
self._expression = unicode(expression)
|
|
self._parsed_expression = expression
|
|
self._file_position = None
|
|
else:
|
|
raise TypeError('expression is not of supported types')
|
|
|
|
@property
|
|
def expression(self):
|
|
return self._expression
|
|
|
|
@property
|
|
def version(self):
|
|
return self._version
|
|
|
|
@property
|
|
def source_file_position(self):
|
|
return self._file_position
|
|
|
|
@source_file_position.setter
|
|
def source_file_position(self, value):
|
|
self._file_position = value
|
|
|
|
def __repr__(self):
|
|
return 'YAQL(%s)' % self._expression
|
|
|
|
def __str__(self):
|
|
return self._expression
|
|
|
|
@staticmethod
|
|
def is_expression(expression, version):
|
|
if not isinstance(expression, types.StringTypes):
|
|
return False
|
|
if re.match('^[\s\w\d.:]*$', expression):
|
|
return False
|
|
try:
|
|
yaql_integration.parse(expression, version)
|
|
return True
|
|
except yaql_exceptions.YaqlParsingException:
|
|
return False
|
|
|
|
def __call__(self, context):
|
|
if context:
|
|
context[constants.CTX_CURRENT_INSTRUCTION] = self
|
|
return self._parsed_expression.evaluate(context=context)
|