pmemstat 2.3.26__tar.gz → 2.3.27__tar.gz

{pmemstat-2.3.26/src/pmemstat.egg-info → pmemstat-2.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pmemstat
-Version: 2.3.26
+Version: 2.3.27
 Summary: Report Proportional Memory on Linux
 Author-email: Joe Defen <joedef@duck.com>
 License: MIT
@@ -13,7 +13,6 @@ Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: importlib-metadata; python_version < "3.8"
 Requires-Dist: psutil>5.9
 
 > **Quick Start**: from the CLI

{pmemstat-2.3.26 → pmemstat-2.3.27}/pyproject.toml

@@ -32,7 +32,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pmemstat"
-version = "2.3.26"
+version = "2.3.27"
 description = "Report Proportional Memory on Linux"
 authors = [
     {name = "Joe Defen", email = "joedef@duck.com"},
@@ -50,7 +50,6 @@ classifiers = [
 ]
 
 dependencies = [
-    'importlib-metadata; python_version<"3.8"',
     'psutil>5.9',
 ]
 
@@ -59,7 +58,7 @@ dependencies = [
 "Bug Tracker" = "https://github.com/joedefen/pmemstat/issues"
 
 [project.scripts]
-pmemstat = "pmemstat.pmemstat:run"
+pmemstat = "pmemstat.main:run"
 
 [tool.setuptools]
 package-dir = {"" = "src"}
@@ -69,5 +68,5 @@ where = ["src"]
 
 [tool.setuptools.package-data]
 exclude = [
-    "/pmemstat/__pycache__",
+    "__pycache__",
 ]

{pmemstat-2.3.26 → pmemstat-2.3.27}/src/pmemstat/CpuSmooth.py

@@ -69,6 +69,7 @@ class SysStat:
     @staticmethod
     def refresh():
         """ TBD """
+        # pylint: disable=protected-access
         return SysStat.get_singleton()._refresh()
 
     def _refresh(self):
@@ -229,7 +230,7 @@ class CpuSmooth:
             self.hists.pop(0)
         try:
             _, _, delta_mono = pct(self.hists[-1], self.hists[-2])
-        except:
+        except Exception:
             pass
         if delta_mono <= 0.0:
             self.hists.pop()

{pmemstat-2.3.26 → pmemstat-2.3.27}/src/pmemstat/KillThem.py

@@ -3,7 +3,7 @@
 """
 Module to kill a set of processes and ensure they are really gone.
 """
-# pylint: disable=broad-except
+# pylint: disable=broad-except,invalid-name,too-few-public-methods
 
 import os
 import sys
@@ -26,7 +26,7 @@ class KillThem():
                  signal.SIGTERM, signal.SIGTERM, signal.SIGTERM,
                  signal.SIGTERM, signal.SIGTERM, signal.SIGTERM,
                  signal.SIGKILL, signal.SIGKILL, signal.SIGKILL]
-        last_sig = '' 
+        last_sig = ''
         for sig in sigs:
             for pid in list(self.pids):
                 try:

{pmemstat-2.3.26 → pmemstat-2.3.27}/src/pmemstat/Window.py

@@ -4,7 +4,7 @@
 Custom Wrapper for python curses.
 """
 # pylint: disable=too-many-instance-attributes,too-many-arguments
-# pylint: disable=invalid-name,broad-except
+# pylint: disable=invalid-name,broad-except,too-many-branches
 
 import traceback
 import atexit
@@ -111,6 +111,7 @@ class OptionSpinner:
         self._register(ns)
 
     def show_help_nav_keys(self, win):
+        """ Get/present standard verbiage for the navigation keys"""
         for line in Window.get_nav_keys_blurb().splitlines():
             if line:
                 win.add_header(line)
@@ -440,7 +441,7 @@ class Window:
             if ind_pos >= 0:
                 bot, cnt = ind_pos, 1
                 if 0 < ind_pos < self.cols-1:
-                    width = (self.scroll_view_size/self.body.row_cnt*self.cols)
+                    width = self.scroll_view_size/self.body.row_cnt * self.cols
                     bot = max(int(round(ind_pos-width/2)), 1)
                     top = min(int(round(ind_pos+width/2)), self.cols-1)
                     cnt = top - bot
@@ -631,7 +632,7 @@ if __name__ == '__main__':
                     for num in range(1, opts.pick_size):
                         win.draw(num+idx*opts.pick_size, 0, f'  addon: {loop}.{line}')
             win.render()
-            answer = do_key(win.prompt(seconds=5))
+            do_key(win.prompt(seconds=5))
             win.clear()
 
     try:

pmemstat-2.3.26/src/pmemstat/pmemstat.py → pmemstat-2.3.27/src/pmemstat/main.py

@@ -50,14 +50,9 @@ import curses
 from types import SimpleNamespace
 from io import StringIO
 from datetime import datetime, timedelta
-try:
-    from Window import Window, OptionSpinner
-    from KillThem import KillThem
-    from CpuSmooth import CpuSmooth, SysStat
-except Exception:
-    from pmemstat.Window import Window, OptionSpinner
-    from pmemstat.KillThem import KillThem
-    from pmemstat.CpuSmooth import CpuSmooth, SysStat
+from pmemstat.Window import Window, OptionSpinner
+from pmemstat.KillThem import KillThem
+from pmemstat.CpuSmooth import CpuSmooth, SysStat
 
 # Trace Levels:
 #  0 - forced, temporary debugging (comment it out)
@@ -189,7 +184,7 @@ class ZramProjector:
             for key, value in vars(stat).items():
                 stats[key] += value
         stats = SimpleNamespace(**stats)
-        self.meminfo.MemZram = stats.mem_used_total 
+        self.meminfo.MemZram = stats.mem_used_total
 
         e_used = meminfo.MemUsed - stats.mem_used_total + stats.orig_data_size
         ratio = None
@@ -212,7 +207,7 @@ class ZramProjector:
             # now add uncompressed memory
         e_max_used += meminfo.MemTotal - e_max_used/ratio
         self.e_max_used = e_max_used
-        # self.e_max_used = max(e_max_total, e_used) # TODO: uncomment
+        # self.e_max_used = max(e_max_total, e_max_used)
         self.e_avail = e_max_used - e_used
 
 
@@ -1190,6 +1185,13 @@ class PmemStat:
             else:
                 assert False, f'unsupported mode ({self.mode})'
 
+def rerun_module_as_root(module_name):
+    """ rerun using the module name """
+    if os.geteuid() != 0: # Re-run the script with sudo
+        os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+        vp = ['sudo', sys.executable, '-m', module_name] + sys.argv[1:]
+        os.execvp('sudo', vp)
+
 def main():
     """Main loop"""
     global DebugLevel
@@ -1234,8 +1236,7 @@ def main():
 
     if not opts.run_as_user and os.geteuid() != 0:
         # Re-run the script with sudo needed and opted
-        sys.argv[0] = __file__
-        os.execvp('sudo', ['sudo', sys.executable] + sys.argv)
+        rerun_module_as_root('pmemstat.main')
 
 
     if opts.min_delta_kb is None:

{pmemstat-2.3.26 → pmemstat-2.3.27/src/pmemstat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pmemstat
-Version: 2.3.26
+Version: 2.3.27
 Summary: Report Proportional Memory on Linux
 Author-email: Joe Defen <joedef@duck.com>
 License: MIT
@@ -13,7 +13,6 @@ Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: importlib-metadata; python_version < "3.8"
 Requires-Dist: psutil>5.9
 
 > **Quick Start**: from the CLI

{pmemstat-2.3.26 → pmemstat-2.3.27}/src/pmemstat.egg-info/SOURCES.txt

@@ -5,7 +5,7 @@ src/pmemstat/CpuSmooth.py
 src/pmemstat/KillThem.py
 src/pmemstat/Window.py
 src/pmemstat/__init__.py
-src/pmemstat/pmemstat.py
+src/pmemstat/main.py
 src/pmemstat.egg-info/PKG-INFO
 src/pmemstat.egg-info/SOURCES.txt
 src/pmemstat.egg-info/dependency_links.txt

pmemstat-2.3.27/src/pmemstat.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+pmemstat = pmemstat.main:run

pmemstat-2.3.27/src/pmemstat.egg-info/requires.txt

@@ -0,0 +1 @@
+psutil>5.9

pmemstat-2.3.26/src/pmemstat/__init__.py

@@ -1,4 +0,0 @@
-from .pmemstat import run
-
-if __name__ == "__main__":
-    run()

pmemstat-2.3.26/src/pmemstat.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-pmemstat = pmemstat.pmemstat:run

pmemstat-2.3.26/src/pmemstat.egg-info/requires.txt

@@ -1,4 +0,0 @@
-psutil>5.9
-
-[:python_version < "3.8"]
-importlib-metadata