From 7739e9283f9a71ff8a352a6716faf8c3d745fb90 Mon Sep 17 00:00:00 2001
From: kuangcx <kuangcx@inspur.com>
Date: Tue, 22 Dec 2020 18:04:03 -0800
Subject: [PATCH] remove six in venus/common/utils.py, add urlib3 in
 requirement.txt

Change-Id: Idba7784b938fcb4b409fbdf1d5e0cedb672baeda
---
 requirements.txt      | 13 +++++++++++--
 venus/common/utils.py |  3 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0aeb579..94edf55 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
\ No newline at end of file
diff --git a/venus/common/utils.py b/venus/common/utils.py
index 91e26a7..d9a2a99 100644
--- a/venus/common/utils.py
+++ b/venus/common/utils.py
@@ -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