Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecation warning due to base64.decodestring in Python 3. (#3272)

Browse Source
This commit is contained in:
Karthikeyan Singaravelan 2020-09-02 15:40:29 +05:30 committed by GitHub
parent 6c4a60d037
commit 3fb7cf75d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_ec2/test_instances.py
View File

@ -23,6 +23,11 @@ from moto import mock_ec2_deprecated, mock_ec2, mock_cloudformation
from tests.helpers import requires_boto_gte from tests.helpers import requires_boto_gte
if six.PY2:
decode_method = base64.decodestring
else:
decode_method = base64.decodebytes
################ Test Readme ############### ################ Test Readme ###############
def add_servers(ami_id, count): def add_servers(ami_id, count):
conn = boto.connect_ec2() conn = boto.connect_ec2()
@ -908,7 +913,7 @@ def test_user_data_with_run_instance():
instance_attribute = instance.get_attribute("userData") instance_attribute = instance.get_attribute("userData")
instance_attribute.should.be.a(InstanceAttribute) instance_attribute.should.be.a(InstanceAttribute)
retrieved_user_data = instance_attribute.get("userData").encode("utf-8") retrieved_user_data = instance_attribute.get("userData").encode("utf-8")
decoded_user_data = base64.decodestring(retrieved_user_data) decoded_user_data = decode_method(retrieved_user_data)
decoded_user_data.should.equal(b"some user data") decoded_user_data.should.equal(b"some user data")