From cc29ae1cd41d1f403511730d5ba44dded967fb12 Mon Sep 17 00:00:00 2001
From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Fri, 9 Mar 2018 15:53:12 +0800
Subject: unify message prompt

Change-Id: I31a10c0aa92a72fdbd76475e6f618f63fef9b925
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---
 .../testapi-client/testapiclient/http_client.py    | 45 +++++++++-------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'testapi/testapi-client/testapiclient/http_client.py')

diff --git a/testapi/testapi-client/testapiclient/http_client.py b/testapi/testapi-client/testapiclient/http_client.py
index aa6ef11..8a33a8c 100644
--- a/testapi/testapi-client/testapiclient/http_client.py
+++ b/testapi/testapi-client/testapiclient/http_client.py
@@ -24,51 +24,44 @@ class HTTPClient(object):
             HTTPClient.__instance = self
 
     def get(self, url):
-        r = requests.get(url)
-        if r.status_code == 200:
-            return r.json()
-        else:
-            return r.text
-
-    def _session_request(self, method, *args, **kwargs):
-        return getattr(user.User.session, method)(*args, **kwargs)
+        return requests.get(url)
 
     def post(self, url, data):
-        return self._session_request('post', url,
-                                     data=json.dumps(data),
-                                     headers=HTTPClient.headers)
+        return self._request('post', url,
+                             data=json.dumps(data),
+                             headers=self.headers)
 
     def put(self, url, data):
-        return self._session_request('put', url,
-                                     data=json.dumps(data),
-                                     headers=HTTPClient.headers).text
+        return self._request('put', url,
+                             data=json.dumps(data),
+                             headers=self.headers)
 
     def delete(self, url, *args):
-        if(args.__len__() > 0):
-            r = self._session_request('delete', url,
-                                      data=json.dumps(args[0]),
-                                      headers=HTTPClient.headers)
-        else:
-            r = self._session_request('delete', url)
-        return r.text
+        data = json.dumps(args[0]) if len(args) > 0 else None
+        return self._request('delete', url,
+                             data=data,
+                             headers=self.headers)
+
+    def _request(self, method, *args, **kwargs):
+        return getattr(user.User.session, method)(*args, **kwargs)
 
 
-def http_request(method, *args, **kwargs):
+def _request(method, *args, **kwargs):
     client = HTTPClient.get_Instance()
     return getattr(client, method)(*args, **kwargs)
 
 
 def get(url):
-    return http_request('get', url)
+    return _request('get', url)
 
 
 def post(url, data):
-    return http_request('post', url, data)
+    return _request('post', url, data)
 
 
 def put(url, data):
-    return http_request('put', url, data)
+    return _request('put', url, data)
 
 
 def delete(url, data=None):
-    return http_request('delete', url, data)
+    return _request('delete', url, data)
-- 
cgit 1.2.3-korg