Skip to content

Commit af0268e

Browse files
authored
Replaced six MovedAttribute with try catch in order to prevent six requirement in order to run setup.py (#43)
1 parent 62db5be commit af0268e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

launchkey/__init__.py

-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
"""LaunchKey Service SDK module"""
2-
from six import add_move, MovedAttribute
3-
4-
add_move(MovedAttribute('encodebytes',
5-
'base64', 'base64',
6-
'encodestring', 'encodebytes'))
7-
82
SDK_VERSION = '3.3.0'
93
LAUNCHKEY_PRODUCTION = "https://api.launchkey.com"
104
VALID_JWT_ISSUER_LIST = ["svc", "dir", "org"]

launchkey/clients/organization.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
# pylint: disable=too-many-public-methods,invalid-name,deprecated-method
44
# pylint: disable=too-many-arguments
55

6-
from base64 import encodestring
6+
try:
7+
from base64 import encodebytes as encodestring
8+
except ImportError: # pragma: no cover
9+
from base64 import encodestring
710
from .base import ServiceManagingBaseClient, api_call
811
from ..utils.shared import iso_format
912
from ..entities.shared import PublicKey

0 commit comments

Comments
 (0)