diff options
| author | liu lei <leolovenet@gmail.com> | 2016-11-17 03:40:23 +0800 |
|---|---|---|
| committer | liu lei <leolovenet@gmail.com> | 2016-11-17 03:40:23 +0800 |
| commit | e56d53caa66b27dd124b6e05960560e6bfb9f345 (patch) | |
| tree | c5d9f5c9aa2675b3e87753942daa202b5e5f7b82 /python.d | |
| parent | 0acd15dd4aae24a0366fafce03679c51feed779d (diff) | |
Delete some mistakes
Diffstat (limited to 'python.d')
| -rw-r--r-- | python.d/python_modules/base.py | 4 | ||||
| -rw-r--r-- | python.d/redis.chart.py | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py index 5077e9995e..8940b8731a 100644 --- a/python.d/python_modules/base.py +++ b/python.d/python_modules/base.py @@ -692,11 +692,7 @@ class SocketService(SimpleService): break self.debug("received data:", str(buf)) -<<<<<<< HEAD data += buf.decode('utf-8', 'ignore') -======= - data += buf.decode(errors='ignore') ->>>>>>> upstream/master if self._check_raw_data(data): break diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py index 7ed343de49..61f4f6d619 100644 --- a/python.d/redis.chart.py +++ b/python.d/redis.chart.py @@ -99,7 +99,6 @@ class Service(SocketService): Get data from socket :return: dict """ -<<<<<<< HEAD if self.passwd: info_request = self.request self.request = "AUTH " + self.passwd + "\r\n" @@ -108,9 +107,6 @@ class Service(SocketService): self.error("invalid password") return None self.request = info_request - -======= ->>>>>>> upstream/master response = self._get_raw_data() if response is None: # error has already been logged |