openstack
/
ironic
Code Issues Proposed changes

Merge "Python 3.9: base64.{en,de}codestring function is removed"

This commit is contained in:
Zuul 2020-10-27 03:59:26 +00:00 committed by Gerrit Code Review
parent 5e68f79102 e6f0adcbc3
commit f0d56a69fa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/api/types.py
View File

@ -142,12 +142,12 @@ class BinaryType(UserType):
def tobasetype(self, value):
if value is None:
return None
return base64.encodestring(value)
return base64.encodebytes(value)
def frombasetype(self, value):
if value is None:
return None
return base64.decodestring(value)
return base64.decodebytes(value)
#: The binary almost-native type

4
ironic/tests/unit/api/test_types.py
View File

@ -446,13 +446,13 @@ Value: 'v3'. Value should be one of: v., v.",
def test_binary_to_base(self):
import base64
assert types.binary.tobasetype(None) is None
expected = base64.encodestring(b'abcdef')
expected = base64.encodebytes(b'abcdef')
assert types.binary.tobasetype(b'abcdef') == expected
def test_binary_from_base(self):
import base64
assert types.binary.frombasetype(None) is None
encoded = base64.encodestring(b'abcdef')
encoded = base64.encodebytes(b'abcdef')
assert types.binary.frombasetype(encoded) == b'abcdef'
def test_wsattr_weakref_datatype(self):