Merge branch 'jun66j5-py26-compat'

Author: fabianp

Makefile

@@ -1,5 +1,4 @@
 PYTHON ?= python
-IPYTHON ?= ipython
 
 .PHONY: test
 
@@ -15,5 +14,3 @@ test:
 	$(PYTHON) test/test_import.py
 	$(PYTHON) test/test_memory_usage.py
 	$(PYTHON) test/test_precision_import.py
-	$(IPYTHON) test/test_ipython.py
-

memory_profiler.py

@@ -1077,7 +1077,7 @@ def choose_backend(new_backend=None):
         ('tracemalloc', has_tracemalloc),
         ('no_backend', True)
     ]
-    backends_indices = {b[0]: i for i, b in enumerate(all_backends)}
+    backends_indices = dict((b[0], i) for i, b in enumerate(all_backends))
 
     if new_backend is not None:
         all_backends.insert(0, all_backends.pop(backends_indices[new_backend]))

test/test_gen.py

@@ -10,8 +10,8 @@ def my_func():
 @profile
 def test_comprehension():
     # Dict comprehension
-    d_comp = {str(k*k): [v] * (1<<17)
-              for (v, k) in enumerate(range(99, 111))}
+    d_comp = dict((str(k*k), [v] * (1<<17))
+                  for (v, k) in enumerate(range(99, 111)))
 
     # List comprehension
     l_comp = [[i] * (i<<9) for i in range(99)]
@@ -20,7 +20,7 @@ def test_comprehension():
 
     def hh(x=1):
         # Set comprehension
-        s_comp = {('Z',) * (k<<13) for k in range(x, 19 + 2*x)}
+        s_comp = set(('Z',) * (k<<13) for k in range(x, 19 + 2*x))
         return s_comp
 
     val = [range(1, 4), max(1, 4), 42 + len(hh())]