Commit c2a9e75b authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

corrected encoding problem

parent ef230617
...@@ -24,15 +24,18 @@ class BakeTargetID(): ...@@ -24,15 +24,18 @@ class BakeTargetID():
""" """
if(self._tid is None): if(self._tid is None):
return str(None) return str(None)
return str(_pybaketarget.target_id_to_string(self._tid)) byte_string = _pybaketarget.target_id_to_string(self._tid)
return byte_string.decode()
@staticmethod @staticmethod
def from_str(string): def from_str(byte_string):
""" """
Converts a string representation of the BakeTargetID into Converts a string representation of the BakeTargetID into
a concrete BakeTargetID object. a concrete BakeTargetID object.
""" """
tid = _pybaketarget.target_id_from_string(str(string)) if(isinstance(byte_string,str)):
byte_string = byte_string.encode()
tid = _pybaketarget.target_id_from_string(byte_string)
if(tid is None): if(tid is None):
return None return None
else: else:
...@@ -63,15 +66,17 @@ class BakeRegionID(): ...@@ -63,15 +66,17 @@ class BakeRegionID():
if(self._rid is None): if(self._rid is None):
return str(None) return str(None)
a = _pybaketarget.region_id_to_string(self._rid) a = _pybaketarget.region_id_to_string(self._rid)
return base64.b64encode(a) return base64.b64encode(a).decode()
@staticmethod @staticmethod
def from_str(string): def from_str(byte_string):
""" """
Converts a string representing a BakeRegionID into a concrete Converts a string representing a BakeRegionID into a concrete
BakeRegionID object. BakeRegionID object.
""" """
rid = _pybaketarget.region_id_from_string(base64.b64decode(str(string))) if(isinstance(byte_string,str)):
byte_string = byte_string.encode()
rid = _pybaketarget.region_id_from_string(base64.b64decode(byte_string))
if(rid is None): if(rid is None):
return None return None
else: else:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment