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

Fix base64 deprecated methods in kinesis.utils (#2209)

Browse Source 
* Fix base64 deprecated methods

Using right encode and decode methods according to python version.

* moved imports on top

E402 module level import not at top of file
This commit is contained in:
sergejs-katusenoks 2019-05-21 17:47:35 +01:00 committed by Terry Cain
parent 796dd71c0c
commit 6628567cbc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moto/kinesis/utils.py
View File

@ -1,8 +1,19 @@
import sys
import base64 import base64
from .exceptions import InvalidArgumentError from .exceptions import InvalidArgumentError
if sys.version_info[0] == 2:
encode_method = base64.encodestring
decode_method = base64.decodestring
elif sys.version_info[0] == 3:
encode_method = base64.encodebytes
decode_method = base64.decodebytes
else:
raise Exception("Python version is not supported")
def compose_new_shard_iterator(stream_name, shard, shard_iterator_type, starting_sequence_number, def compose_new_shard_iterator(stream_name, shard, shard_iterator_type, starting_sequence_number,
at_timestamp): at_timestamp):
if shard_iterator_type == "AT_SEQUENCE_NUMBER": if shard_iterator_type == "AT_SEQUENCE_NUMBER":
@ -22,7 +33,7 @@ def compose_new_shard_iterator(stream_name, shard, shard_iterator_type, starting
def compose_shard_iterator(stream_name, shard, last_sequence_id): def compose_shard_iterator(stream_name, shard, last_sequence_id):
return base64.encodestring( return encode_method(
"{0}:{1}:{2}".format( "{0}:{1}:{2}".format(
stream_name, stream_name,
shard.shard_id, shard.shard_id,
@ -32,4 +43,4 @@ def compose_shard_iterator(stream_name, shard, last_sequence_id):
def decompose_shard_iterator(shard_iterator): def decompose_shard_iterator(shard_iterator):
return base64.decodestring(shard_iterator.encode("utf-8")).decode("utf-8").split(":") return decode_method(shard_iterator.encode("utf-8")).decode("utf-8").split(":")