Merge lp:~cjwatson/meliae/py3-test-intern-from-cache into lp:meliae

[Colin Watson]

Cope with constant folding improvements in Python >= 3.7.

Test_MemObjectProxy.test__intern_from_cache assumed that Python wouldn't notice certain opportunities for constant folding, but as of Python 3.7 this assumption no longer holds. Adjust the test slightly to cope with this.

[Colin Watson (cjwatson)]

You'll probably be relieved to hear that, as of this merge proposal, https://code.launchpad.net/~cjwatson/meliae/+activereviews covers all the remaining substantive changes required for a Python 3 port. The only remaining pieces after that are trivial metadata changes, which I'll propose after everything else has landed.

[John A Meinel (jameinel)]

Thanks

review: Approve

=== modified file 'meliae/tests/test__loader.py'
--- meliae/tests/test__loader.py	2020-01-30 13:04:35 +0000
+++ meliae/tests/test__loader.py	2020-03-11 20:56:26 +0000
@@ -339,13 +339,20 @@
         t = cache['my  type']
         self.assertTrue(mop.type_str is t)
         del self.moc[addr]
-        mop = self.moc.add(1234566+1, 'my ' + ' ty' + 'pe', 256)
+        # We have to work a bit here to defeat the more aggressive constant
+        # folding in Python >= 3.7.
+        addr1234566 = 1234566
+        type_str = 'my  ty'
+        type_str += 'pe'
+        mop = self.moc.add(addr1234566+1, type_str, 256)
         addr876543 = 876543
         cache[addr876543] = addr876543
         addr654321 = 654321
         cache[addr654321] = addr654321
-        mop.children = [876542+1, 654320+1]
-        mop.parents = [876542+1, 654320+1]
+        addr876542 = 876542
+        addr654320 = 654320
+        mop.children = [addr876542+1, addr654320+1]
+        mop.parents = [addr876542+1, addr654320+1]
         self.assertFalse(mop.address is addr)
         self.assertFalse(mop.type_str is t)
         rl = mop.children