Update upstream source from tag 'upstream/1.9.0+dfsg'

Update to upstream version '1.9.0+dfsg'
with Debian dir 28b8242a05f9ad26cd1cdbcf078be754fc7d6251

1 files changed, 3 insertions, 8 deletions

diff --git a/python.d/memcached.chart.py b/python.d/memcached.chart.py
index 0d6807ba..4f7adfa2 100644
--- a/python.d/memcached.chart.py
+++ b/python.d/memcached.chart.py
@@ -2,7 +2,7 @@
 # Description: memcached netdata python.d module
 # Author: Pawel Krupa (paulfantom)
 
-from base import SocketService
+from bases.FrameworkServices.SocketService import SocketService
 
 # default module values (can be overridden per job in `config`)
 #update_every = 2
@@ -149,9 +149,8 @@ class Service(SocketService):
                     data[t[0]] = t[1]
                 except (IndexError, ValueError):
                     self.debug("invalid line received: " + str(line))
-                    pass
 
-        if len(data) == 0:
+        if not data:
             self.error("received data doesn't have any records")
             return None
 
@@ -159,7 +158,7 @@ class Service(SocketService):
         try:
             data['avail'] = int(data['limit_maxbytes']) - int(data['bytes'])
             data['used'] = int(data['bytes'])
-        except:
+        except (KeyError, ValueError, TypeError):
             pass
 
         return data
@@ -178,11 +177,7 @@ class Service(SocketService):
         :return: boolean
         """
         self._parse_config()
-        if self.name == "":
-            self.name = "local"
-        self.chart_name += "_" + self.name
         data = self._get_data()
         if data is None:
             return False
-
         return True