Remove simplejson dependency: use json module from stdlib.

Add missing redis dependency.
This commit is contained in:
Javier Cacheiro
2022-04-22 13:38:49 +02:00
parent 7f53e9c22c
commit 5dd81a0363
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ setup(name=name,
install_requires=[ install_requires=[
'numpy', 'requests', 'numpy', 'requests',
'jwcrypto', 'jwcrypto',
'redis', 'simplejson', 'redis',
], ],
zip_safe=False, zip_safe=False,
entry_points={ entry_points={
+1
View File
@@ -1,4 +1,5 @@
mock mock
nose2 nose2
six six
redis
wrapt<=1.12.1;python_version<="3.4" wrapt<=1.12.1;python_version<="3.4"
+6 -7
View File
@@ -3,6 +3,7 @@ import os
import sys import sys
import time import time
import re import re
import json
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -167,14 +168,13 @@ class TokenRedis():
Spawn a test "server" using netcat Spawn a test "server" using netcat
nc -l 5000 -v nc -l 5000 -v
Note: you have to install also the 'redis' and 'simplejson' modules Note: you have to install also the 'redis' module
pip install redis simplejson pip install redis
""" """
def __init__(self, src): def __init__(self, src):
try: try:
# import those ahead of time so we provide error earlier # import those ahead of time so we provide error earlier
import redis import redis
import simplejson
self._server, self._port = src.split(":") self._server, self._port = src.split(":")
logger.info("TokenRedis backend initilized (%s:%s)" % logger.info("TokenRedis backend initilized (%s:%s)" %
(self._server, self._port)) (self._server, self._port))
@@ -183,15 +183,14 @@ class TokenRedis():
src) src)
sys.exit() sys.exit()
except ImportError: except ImportError:
logger.error("package redis or simplejson not found, are you sure you've installed them correctly?") logger.error("package redis not found, are you sure you've installed them correctly?")
sys.exit() sys.exit()
def lookup(self, token): def lookup(self, token):
try: try:
import redis import redis
import simplejson
except ImportError: except ImportError:
logger.error("package redis or simplejson not found, are you sure you've installed them correctly?") logger.error("package redis not found, are you sure you've installed them correctly?")
sys.exit() sys.exit()
logger.info("resolving token '%s'" % token) logger.info("resolving token '%s'" % token)
@@ -202,7 +201,7 @@ class TokenRedis():
else: else:
responseStr = stuff.decode("utf-8") responseStr = stuff.decode("utf-8")
logger.debug("response from redis : %s" % responseStr) logger.debug("response from redis : %s" % responseStr)
combo = simplejson.loads(responseStr) combo = json.loads(responseStr)
(host, port) = combo["host"].split(':') (host, port) = combo["host"].split(':')
logger.debug("host: %s, port: %s" % (host,port)) logger.debug("host: %s, port: %s" % (host,port))
return [host, port] return [host, port]