Merge lp:~jelmer/meliae/itervalues into lp:meliae

[Jelmer Vernooij]

Use dict.values rather than dict.itervalues, which is not available on Python 3.

Use dict.values rather than dict.itervalues, which is not available on Python 3.

[John A Meinel (jameinel)]

Are we missing a test case? The test suite was passing on Python3 but didn't seem to encounter this.

[John A Meinel (jameinel)]

It seems our Python 3 support isn't quite as complete as we thought:
https://bugs.launchpad.net/meliae/+bug/1883514

The test isn't very robust but just calling dump_gc_objects triggers fatal errors:
+ def test_smoke_dump_gc_objects(self):
+ a_dict = {'some_specialty_content': 'more_content'}
+ t = tempfile.TemporaryFile(prefix='meliae-')
+ t_file = getattr(t, 'file', t)
+ scanner.dump_gc_objects(t_file)
+ t.flush()
+ t.seek(0)
+ content = t_file.read()
+ self.assertIn('some_specialty_content', content)
+

Unmerged revisions

230. By Jelmer Vernooij on 2020-06-08

Use dict.values rather than dict.itervalues, which is not available on Python3.

=== modified file 'meliae/scanner.py'
--- meliae/scanner.py	2020-02-03 22:08:03 +0000
+++ meliae/scanner.py	2020-06-09 13:08:53 +0000
@@ -93,15 +93,15 @@
     # In current versions of python, these are all pre-cached
     nodump.extend(range(-5, 256))
     nodump.extend([chr(c) for c in range(256)])
-    nodump.extend([t for t in types.__dict__.itervalues()
-                      if type(t) is types.TypeType])
+    nodump.extend([t for t in types.__dict__.values()
+                   if isinstance(t, type)])
     nodump.extend([set, dict])
     # Some very common interned strings
     nodump.extend(('__doc__', 'self', 'operator', '__init__', 'codecs',
                    '__new__', '__builtin__', '__builtins__', 'error', 'len',
                    'errors', 'keys', 'None', '__module__', 'file', 'name', '',
                    'sys', 'True', 'False'))
-    nodump.extend((BaseException, Exception, StandardError, ValueError))
+    nodump.extend((BaseException, Exception, Exception, ValueError))
     for obj in nodump:
         _scanner.dump_object_info(outf, obj, nodump=None, recurse_depth=0)
     # Avoid dumping the all_objs list and this function as well. This helps
@@ -146,7 +146,6 @@
         outf.flush()
 
 
-
 def get_recursive_size(obj):
     """Get the memory referenced from this object.