openstack
/
murano
Code Issues Proposed changes

Fix base64 on Python 3 in yaql_functions.py 

Don't add murano.tests.unit.dsl.test_engine_yaql_functions to
tox.ini. The test requires a new release of yaql to get the last
Python 3 fix (change Ia262ca3ff9ffaad618bde9c1157559e7320434ee).

Blueprint: murano-python-3-support
Change-Id: I8a42e9b31b13bd5075708c32130b1c2997971cb6
This commit is contained in:
Victor Stinner 2016-04-15 16:45:23 +02:00
parent 2461badd18
commit f6e795efcf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
murano/engine/system/yaql_functions.py
View File

@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import base64
import collections
import random
import re
@ -22,6 +21,7 @@ import time
import jsonpatch
import jsonpointer
from oslo_serialization import base64
import six
from yaql.language import specs
from yaql.language import utils
@ -40,13 +40,13 @@ _random_string_counter = None
@specs.parameter('value', yaqltypes.String())
@specs.extension_method
def base64encode(value):
return base64.b64encode(value)
return base64.encode_as_text(value)
@specs.parameter('value', yaqltypes.String())
@specs.extension_method
def base64decode(value):
return base64.b64decode(value)
return base64.decode_as_text(value)
@specs.parameter('collection', yaqltypes.Iterable())