remove six in venus/common/utils.py, add urlib3 in requirement.txt

Change-Id: Idba7784b938fcb4b409fbdf1d5e0cedb672baeda
This commit is contained in:
kuangcx 2020-12-22 18:04:03 -08:00
parent 53990ad4e2
commit 7739e9283f
2 changed files with 12 additions and 4 deletions

View File

@ -26,8 +26,17 @@ six>=1.9.0
SQLAlchemy>=1.2.19 # MIT
sqlalchemy-migrate>=0.9.6
PyMySQL>=0.7.11
elasticsearch>=5.0.0,<6.0.0
apscheduler # MIT License
elasticsearch>=7.10.1
apscheduler>=3.6.3
paste>=3.0.2
webob>=1.8.5
lxml>=4.4.0
stevedore>=3.3.0
Routes>=2.5.1
eventlet>=0.30.0
greenlet>=0.4.17
urllib3>=1.24.2
retrying>=1.3.3
argparse>=1.4.0
setuptools>=39.2.0

View File

@ -15,7 +15,6 @@
"""Implementation of Utils."""
import json
import six
import urllib3
from oslo_log import log as logging
@ -39,5 +38,5 @@ def request_es(url, method, data=None):
return resp.status, resp.data.strip()
except Exception as e:
LOG.error(_LE("request es, catch exception:%s"), six.text_type(e))
LOG.error(_LE("request es, catch exception:%s"), str(e))
return 0, None