Merge branch 'cmutel-master'

rasbt · May 8, 2015 · dc6da61 · dc6da61
2 parents fd00419 + a8fd701
commit dc6da61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pyprind/prog_class.py b/pyprind/prog_class.py
@@ -139,11 +139,11 @@ def __repr__(self):
                                                                str_end, self.total_time)
         else:
             try:
+                cpu_total = self.process.cpu_percent()
+                mem_total = self.process.memory_percent()
+            except AttributeError: # old version of psutil
                 cpu_total = self.process.get_cpu_percent()
                 mem_total = self.process.get_memory_percent()
-            except AttributeError: # old version of psutil
-                cpu_total = self.process.cpu_percent()
-                mem_total = self.process.memory_percent()    
 
             return 'Title: {}\n'\
                    '  Started: {}\n'\

diff --git a/pyprind/progbar.py b/pyprind/progbar.py
@@ -44,11 +44,11 @@ def __init__(self, iterations, track_time=True, width=30, stream=2, title='', mo
         self._print_progress_bar(0)
         if monitor:
             try:
+                self.process.cpu_percent()
+                self.process.memory_percent()
+            except AttributeError: # old version of psutil
                 self.process.get_cpu_percent()
                 self.process.get_memory_percent()
-            except AttributeError: # old version of psutil
-                cpu_total = self.process.cpu_percent()
-                mem_total = self.process.memory_percent()   
         if self.item_id:
             self._print_item_id()
 

diff --git a/pyprind/progpercent.py b/pyprind/progpercent.py
@@ -37,11 +37,11 @@ def __init__(self, iterations, track_time=True, stream=2, title='', monitor=Fals
         self._print()
         if monitor:
             try:
+                self.process.cpu_percent()
+                self.process.memory_percent()
+            except AttributeError: # old version of psutil
                 self.process.get_cpu_percent()
                 self.process.get_memory_percent()
-            except AttributeError: # old version of psutil
-                cpu_total = self.process.cpu_percent()
-                mem_total = self.process.memory_percent()   
 
 
     def _print(self):