Changeset 12060 for main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py

Timestamp:

25 Nov 2014, 18:44:01 (10 years ago)

Author:

uli

Message:

Merge changes from uli-payments back into trunk.

Location:

main/waeup.ikoba/trunk

Files:

• . (modified) (1 prop)
• src/waeup/ikoba (modified) (1 prop)
• src/waeup/ikoba/utils/utils.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py

@@ -125 +125 @@
     #: value. `cpu-load`, of course, accepts float values only.
     #: `swap-mem` = Swap Memory, `virt-mem` = Virtual Memory,
-    #: `phys-mem` = Physical Memory, `cpu-load` = CPU load in percent.
+    #: `cpu-load` = CPU load in percent.
     SYSTEM_MAX_LOAD = {
         'swap-mem': None,
         'virt-mem': None,
-        'phys-mem': None,
         'cpu-load': 100.0,
         }
@@ -247 +246 @@
             ('swap-mem', psutil.swap_memory),
             ('virt-mem', psutil.virtual_memory),
-            ('phys-mem', psutil.phymem_usage),
             ):
             max_val = max_values.get(key, None)