Delete some mistakes
liu lei committed
Nov 17, 2016 at 03:40 UTC
e56d53caa66b27dd124b6e05960560e6bfb9f345
2 files changed
-8
python.d/python_modules/base.py
-4
@@ -692,11 +692,7 @@ class SocketService(SimpleService):
692
break
693
694
self.debug("received data:", str(buf))
695
-<<<<<<< HEAD
695
data += buf.decode('utf-8', 'ignore')
697
-=======
698
- data += buf.decode(errors='ignore')
699
->>>>>>> upstream/master
696
if self._check_raw_data(data):
697
break
698
python.d/redis.chart.py
-4
@@ -99,7 +99,6 @@ class Service(SocketService):
99
Get data from socket
100
:return: dict
101
"""
102
-<<<<<<< HEAD
102
if self.passwd:
103
info_request = self.request
104
self.request = "AUTH " + self.passwd + "\r\n"
@@ -108,9 +107,6 @@ class Service(SocketService):
107
self.error("invalid password")
108
return None
109
self.request = info_request
111
-
112
-=======
113
->>>>>>> upstream/master
110
response = self._get_raw_data()
111
if response is None:
112
# error has already been logged