Minor refactoring for legibility, plus fix some import statements.

Author: krinsman

nbresuse/__init__.py

@@ -1,5 +1,3 @@
-import os
-
 from tornado import ioloop
 
 from nbresuse.config import ResourceUseDisplay

nbresuse/config.py

@@ -1,3 +1,5 @@
+import os
+
 from traitlets import Bool
 from traitlets import default
 from traitlets import Dict
@@ -14,6 +16,7 @@
 except ImportError:
     from .utils import Callable
 
+
 class PSUtilMetric(TraitType):
     """A trait describing the format to specify a metric from the psutil package"""
 
@@ -28,6 +31,7 @@ def validate(self, obj, value):
                     return value
         self.error(obj, value)
 
+
 class ResourceUseDisplay(Configurable):
     """
     Holds server-side configuration for nbresuse

nbresuse/metrics.py

@@ -11,27 +11,27 @@ def __init__(self, nbapp: NotebookApp):
         self.config = nbapp.web_app.settings["nbresuse_display_config"]
         self.nbapp = nbapp
 
+    def get_process_metric_value(self, process, name, kwargs, attribute=None):
+        try:
+            # psutil.Process methods will either return...
+            metric_value = getattr(process, name)(**kwargs)
+            if attribute is not None:  # ... a named tuple
+                return getattr(metric_value, attribute)
+            else:  # ... or a number
+                return metric_value
+        # Avoid littering logs with stack traces
+        # complaining about dead processes
+        except BaseException:
+            return 0
+
     def process_metric(self, name, kwargs={}, attribute=None):
         if psutil is None:
             return None
         else:
             current_process = psutil.Process()
             all_processes = [current_process] + current_process.children(recursive=True)
 
-            def get_process_metric(process, name, kwargs, attribute=None):
-                try:
-                    # psutil.Process methods will either return...
-                    metric_value = getattr(process, name)(**kwargs)
-                    if attribute is not None:  # ... a named tuple
-                        return getattr(metric_value, attribute)
-                    else:  # ... or a number
-                        return metric_value
-                # Avoid littering logs with stack traces
-                # complaining about dead processes
-                except BaseException:
-                    return 0
-
-            process_metric_value = lambda process: get_process_metric(
+            process_metric_value = lambda process: self.get_process_metric_value(
                 process, name, kwargs, attribute
             )