Refactoring: random cleanup while viewing code with @nick-carbonsoft. (#141)

Author: strizhechenko

netutils_linux_monitoring/base_top.py

@@ -1,3 +1,4 @@
+from abc import abstractmethod
 import argparse
 from os import system
 from random import randint
@@ -101,14 +102,14 @@ def __repr_table__(self, table):
             return BaseTop.header + str(table)
         return str(table)
 
+    @abstractmethod
     def parse(self):
         """ Should read some file(s) into python structure (dict/list) """
-        raise NotImplementedError
 
+    @abstractmethod
     def eval(self):
         """ Should evaluate self.diff using self.previous / self.current """
-        raise NotImplementedError
 
+    @abstractmethod
     def __repr__(self):
         """ Should return string, representing self.diff """
-        raise NotImplementedError

netutils_linux_monitoring/topology.py

@@ -48,7 +48,8 @@ def detect_layout_lscpu(self, lscpu_output=None):
             return lscpu_output
         stdout, return_code = self.__detect_layout_lscpu()
         if return_code != 0:
-            return self.detect_layouts_fallback()
+            self.detect_layouts_fallback()
+            return
         if isinstance(stdout, bytes):
             stdout = str(stdout)
         return stdout
@@ -59,10 +60,9 @@ def detect_layouts_fallback(self):
         """
         process = Popen(['nproc'], stdout=PIPE, stderr=PIPE)
         stdout, _ = process.communicate()
-        if process.returncode != 0:
-            return None
-        cpu_count = int(stdout.strip())
-        self.socket_layout = self.numa_layout = dict(enumerate([0] * cpu_count))
+        if process.returncode == 0:
+            cpu_count = int(stdout.strip())
+            self.socket_layout = self.numa_layout = dict(enumerate([0] * cpu_count))
 
     @staticmethod
     def __detect_layout_lscpu():

setup.py

@@ -16,7 +16,7 @@ def read(*paths):
 
 setuptools.setup(
     name='netutils-linux',
-    version='2.2.8',
+    version='2.2.10',
     author='Oleg Strizhechenko',
     author_email='[email protected]',
     license='MIT',