Merge lp:~cjwatson/meliae/py3-perf-counter into lp:meliae

[Colin Watson]

Port performance counters to Python 3.

/proc/<pid>/status is opened in binary mode, so we need to parse it using bytes-like regexes.

TestPerformanceCounter.test_get_memory needs similar minor adjustments to use bytes where appropriate.

There were various combinations of tabs and spaces which Python 3 now complains about.

[John A Meinel (jameinel)]

review: Approve

=== modified file 'meliae/perf_counter.py'
--- meliae/perf_counter.py	2010-07-12 20:10:34 +0000
+++ meliae/perf_counter.py	2020-02-05 12:04:11 +0000
@@ -110,14 +110,14 @@
             content = f.read()
         finally:
             f.close()
-        m = re.search(r'(?i)vmpeak:\s*(?P<peak>\d+) kB', content)
-	peak = current = None
-        if m is not None:
-	   peak = int(m.group('peak')) * 1024
-        m = re.search(r'(?i)vmsize:\s*(?P<current>\d+) kB', content)
-        if m is not None:
-	   current = int(m.group('current')) * 1024
-	return current, peak
+        m = re.search(br'(?i)vmpeak:\s*(?P<peak>\d+) kB', content)
+        peak = current = None
+        if m is not None:
+            peak = int(m.group('peak')) * 1024
+        m = re.search(br'(?i)vmsize:\s*(?P<current>\d+) kB', content)
+        if m is not None:
+            current = int(m.group('current')) * 1024
+        return current, peak
 
 
 class _Win32PerformanceCounter(PerformanceCounter):

=== modified file 'meliae/tests/test_perf_counter.py'
--- meliae/tests/test_perf_counter.py	2020-01-30 12:10:58 +0000
+++ meliae/tests/test_perf_counter.py	2020-02-05 12:04:11 +0000
@@ -77,23 +77,23 @@
         # value is accurate, but we can at least try
         # Create a very large string, and then delete it.
         p = subprocess.Popen([sys.executable, '-c',
-            'x = "abcd"*(10*1000*1000); del x;'
+            'x = b"abcd"*(10*1000*1000); del x;'
             'import sys;'
             'sys.stdout.write(sys.stdin.read(3));'
             'sys.stdout.flush();'
             'sys.stdout.write(sys.stdin.read(4));'
             'sys.stdout.flush(); sys.stdout.close()'],
             stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-        p.stdin.write('pre')
+        p.stdin.write(b'pre')
         p.stdin.flush()
         p.stdout.read(3)
         cur_mem, peak_mem = perf_counter.perf_counter.get_memory(p)
-	if cur_mem is None or peak_mem is None:
-	    # fail gracefully, though we may want a stronger assertion here
-	    return
+        if cur_mem is None or peak_mem is None:
+            # fail gracefully, though we may want a stronger assertion here
+            return
         self.assertTrue(isinstance(cur_mem, six.integer_types))
         self.assertTrue(isinstance(peak_mem, six.integer_types))
-        p.stdin.write('post')
+        p.stdin.write(b'post')
         p.stdin.flush()
         p.stdout.read()
         self.assertEqual(0, p.wait())