From 56e65b6c7fbc0e42f0e6de3cc2909beddb1e4e06 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Tue, 20 Dec 2016 23:03:48 -0800
Subject: [PATCH 1/8] Reverse order of tuples in GraphState.act_circuit

Seems vaguely sensible. Haven't tested because I'm on a plane.
---
 abp/graphstate.py        |  6 +++---
 doc/index.rst            |  4 ++--
 tests/mock.py            | 10 +++++-----
 tests/test_graphstate.py |  4 ++--
 tests/test_mercedes.py   |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/abp/graphstate.py b/abp/graphstate.py
index 25d1b09..6ef23d4 100755
--- a/abp/graphstate.py
+++ b/abp/graphstate.py
@@ -99,14 +99,14 @@ class GraphState(object):
     def act_circuit(self, circuit):
         """ Run many gates in one call.
 
-        :param circuit: An iterable containing tuples of the form ``(node, operation)``.  If ``operation`` is a name for a local operation (e.g. ``6``, ``hadamard``) then that operation is performed on ``node``.  If ``operation`` is ``cz`` then a CZ is performed on the two nodes in ``node``.
+        :param circuit: An iterable containing tuples of the form ``(operation, node)``.  If ``operation`` is a name for a local operation (e.g. ``6``, ``hadamard``) then that operation is performed on ``node``.  If ``operation`` is ``cz`` then a CZ is performed on the two nodes in ``node``.
 
         Example (makes a Bell pair)::
 
-            >>> g.act_circuit([(0, "hadamard"), (1, "hadamard"), ((0, 1), "cz")])
+            >>> g.act_circuit([("hadamard", 0), ("hadamard", 1), ("cz", (0, 1))])
 
         """
-        for node, operation in circuit:
+        for operation, node in circuit:
             if operation == "cz":
                 self.act_cz(*node)
             else:
diff --git a/doc/index.rst b/doc/index.rst
index b0ef553..4e3bfb2 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -166,8 +166,8 @@ This ought to pop open a browser window at ``http://localhost:5001/``. You can r
 
     >>> from abp import GraphState, VizClient
     >>> g = GraphState(10)
-    >>> g.act_circuit([(i, "hadamard") for i in range(10)])
-    >>> g.act_circuit([((i, i+1), "cz") for i in range(9)])
+    >>> g.act_circuit([("hadamard", i) for i in range(10)])
+    >>> g.act_circuit([("cz", (i, i+1)) for i in range(9)])
     >>> v = VizClient()
     >>> v.update(g)
 
diff --git a/tests/mock.py b/tests/mock.py
index 547edc4..642040c 100644
--- a/tests/mock.py
+++ b/tests/mock.py
@@ -42,7 +42,7 @@ class AndersWrapper(graphsim.GraphRegister):
         return self.to_json() == other.to_json()
 
     def act_circuit(self, circuit):
-        for node, operation in circuit:
+        for operation, node in circuit:
             if operation == "cz":
                 self.act_cz(*node)
             else:
@@ -106,8 +106,8 @@ def named_node_graph():
     """ A graph with named nodes"""
     edges = (0, 1), (1, 2), (2, 0), (0, 3), (100, 200), (200, "named")
     g = ABPWrapper([0, 1, 2, 3, 100, 200, "named"])
-    g.act_circuit((i, "hadamard") for i in g.node)
-    g.act_circuit((edge, "cz") for edge in edges)
+    g.act_circuit(("hadamard", i) for i in g.node)
+    g.act_circuit(("cz", edge) for edge in edges)
     return g
 
 
@@ -115,8 +115,8 @@ def simple_graph():
     """ A simple graph to test with"""
     edges = (0, 1), (1, 2), (2, 0), (0, 3), (100, 200)
     g = ABPWrapper([0, 1, 2, 3, 100, 200])
-    g.act_circuit((i, "hadamard") for i in g.node)
-    g.act_circuit((edge, "cz") for edge in edges)
+    g.act_circuit(("hadamard", i) for i in g.node)
+    g.act_circuit(("cz", edge) for edge in edges)
     return g
 
 
diff --git a/tests/test_graphstate.py b/tests/test_graphstate.py
index 9689321..f307d70 100644
--- a/tests/test_graphstate.py
+++ b/tests/test_graphstate.py
@@ -94,8 +94,8 @@ def test_local_complementation():
     """ Test that local complementation works okay """
     pairs = (0, 1), (0, 3), (1, 3), (1, 2), 
     psi = GraphState(range(4), vop="hadamard")
-    psi.act_circuit([(i, "hadamard") for i in psi.node])
-    psi.act_circuit([(pair, "cz") for pair in pairs])
+    psi.act_circuit([("hadamard", i) for i in psi.node])
+    psi.act_circuit([("cz", pair) for pair in pairs])
     old_edges = psi.edgelist()
     old_state = psi.to_state_vector()
     psi.local_complementation(1)
diff --git a/tests/test_mercedes.py b/tests/test_mercedes.py
index 3a4e81b..548193e 100644
--- a/tests/test_mercedes.py
+++ b/tests/test_mercedes.py
@@ -4,8 +4,8 @@ from mock import simple_graph
 
 def linear_cluster(n):
     g = GraphState(range(n), vop="hadamard")
-    g.act_circuit([(i, "hadamard") for i in range(n)])
-    g.act_circuit([((i, i+1), "cz") for i in range(n-1)])
+    g.act_circuit([("hadamard", i) for i in range(n)])
+    g.act_circuit([("cz", (i, i+1)) for i in range(n-1)])
     return g 
 
 

From 75e6b73e71bbb52eb063c56fbd628e00ba380139 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Tue, 20 Dec 2016 23:06:13 -0800
Subject: [PATCH 2/8] =?UTF-8?q?Bump=20version:=200.4.24=20=E2=86=92=200.4.?=
 =?UTF-8?q?25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg           | 2 +-
 README.md                  | 4 ++--
 abp/static/index.html      | 2 +-
 abp/static/scripts/main.js | 2 +-
 bin/abpserver              | 2 +-
 doc/conf.py                | 4 ++--
 doc/index.rst              | 2 +-
 setup.py                   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index b38ebd2..7e586fc 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.24
+current_version = 0.4.25
 commit = True
 tag = True
 
diff --git a/README.md b/README.md
index cd989c8..05d4e73 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# abp 0.4.24
+# abp 0.4.25
 Python port of Anders and Briegel' s [method](https://arxiv.org/abs/quant-ph/0504117) for fast simulation of Clifford circuits. 
 
 ## Documentation
@@ -8,7 +8,7 @@ You can read the full documentation [here](https://peteshadbolt.co.uk/abp/). You
 It's easiest to install with `pip`:
 
 ```shell
-$ pip install --user abp==0.4.24
+$ pip install --user abp==0.4.25
 ```
 
 Or clone and install in `develop` mode:
diff --git a/abp/static/index.html b/abp/static/index.html
index efcf780..c2c5f88 100644
--- a/abp/static/index.html
+++ b/abp/static/index.html
@@ -24,7 +24,7 @@
 <div id=node_info class=hidden> nothing </div>
 <div id=server_info class=hidden> </div>
 
-<div id=version>Version 0.4.24</div>
+<div id=version>Version 0.4.25</div>
 
 <div id=node_data class=hidden>
 <div id=node_name></div>
diff --git a/abp/static/scripts/main.js b/abp/static/scripts/main.js
index 30675a1..6e8cd0c 100644
--- a/abp/static/scripts/main.js
+++ b/abp/static/scripts/main.js
@@ -1,4 +1,4 @@
-console.log("abp v0.4.24");
+console.log("abp v0.4.25");
 
 window.onload = function() {
     graph.prepare();
diff --git a/bin/abpserver b/bin/abpserver
index e66fc0f..5079d2b 100755
--- a/bin/abpserver
+++ b/bin/abpserver
@@ -81,7 +81,7 @@ if __name__ == '__main__':
 
     # Change to the right working dir
     where = os.path.abspath(resource_filename("abp.static", ""))
-    print "abpserver 0.4.24"
+    print "abpserver 0.4.25"
     print where
     print "Open http://localhost:5001 in a browser!"
     os.chdir(where)
diff --git a/doc/conf.py b/doc/conf.py
index 478899d..6bdcf18 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -60,9 +60,9 @@ author = u'Pete Shadbolt'
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.24'
+version = '0.4.25'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.24'
+release = '0.4.25'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/index.rst b/doc/index.rst
index 4e3bfb2..9247e33 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -26,7 +26,7 @@ You can install from ``pip``:
 
 .. code-block:: bash
 
-   $ pip install --user abp==0.4.24
+   $ pip install --user abp==0.4.25
 
 Alternatively, clone from the `github repo <https://github.com/peteshadbolt/abp>`_ and run ``setup.py``:
 
diff --git a/setup.py b/setup.py
index d48b8a9..15ba5b9 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ STATIC = glob("abp/static/*.*")+glob("abp/static/img/*.*")+glob("abp/static/scri
 
 setup(
     name = "abp",
-    version = "0.4.24",
+    version = "0.4.25",
     packages = ["abp", "abp.static"],
     test_suite = "tests",
     author = "Pete Shadbolt",

From ccfdeca7c814c68dd74cb11494fbeb914cb684b1 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Thu, 22 Dec 2016 05:45:47 +0000
Subject: [PATCH 3/8] Adding options panel.

---
 abp/static/index.html | 31 +++++++++++++++++++------------
 abp/static/main.css   | 13 +++++++++++++
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/abp/static/index.html b/abp/static/index.html
index c2c5f88..1dfd0ff 100644
--- a/abp/static/index.html
+++ b/abp/static/index.html
@@ -27,21 +27,28 @@
 <div id=version>Version 0.4.25</div>
 
 <div id=node_data class=hidden>
-<div id=node_name></div>
+    <div id=node_name></div>
+    <ul>
+        <li id=node_vop></li>
+        <li>Measure in 
+        <a href="#" onclick="editor.measureX()">X</a> / 
+        <a href="#" onclick="editor.measureY()">Y</a> / 
+        <a href="#" onclick="editor.measureZ()">Z</a></li>
+        <li>Act 
+        <a href="#" onclick="editor.hadamard()">Hadamard</a> / 
+        <a href="#" onclick="editor.phase()">Phase</a></li>
+        <li><a href="#" onclick="editor.localComplementation()">Invert neighbourhood</a></li>
+        <li><a href="#" onclick="editor.deleteNode()">Delete</a></li>
+    </ul>
+</div>
+
+
+<div id=options>
 <ul>
-    <li id=node_vop></li>
-    <li>Measure in 
-    <a href="#" onclick="editor.measureX()">X</a> / 
-    <a href="#" onclick="editor.measureY()">Y</a> / 
-    <a href="#" onclick="editor.measureZ()">Z</a></li>
-    <li>Act 
-    <a href="#" onclick="editor.hadamard()">Hadamard</a> / 
-    <a href="#" onclick="editor.phase()">Phase</a></li>
-    <li><a href="#" onclick="editor.localComplementation()">Invert neighbourhood</a></li>
-    <li><a href="#" onclick="editor.deleteNode()">Delete</a></li>
+    <li>Curved edges</li>
+    <li>Show grid</li>
 </ul>
 </div>
 
-
 </body>
 </html>
diff --git a/abp/static/main.css b/abp/static/main.css
index 60460cd..8dd3550 100644
--- a/abp/static/main.css
+++ b/abp/static/main.css
@@ -41,6 +41,19 @@ html, body { margin: 0; padding: 0; overflow: hidden; font-size:  10pt; font-fam
     font-size: 9pt;
 }
 
+#options {
+    background-color: rgba(256, 256, 256, .5);
+    color: black;
+    padding: 10px;
+    font-family: monospace;
+    position: absolute;
+    text-align: right;
+    bottom: 10px;
+    right: 10px;
+    font-size: 9pt;
+}
+
+
 #version {
     color:black;
     padding: 10px;

From 7ff467f070f29a6a6e4e297a27aab9b54ed5fcb5 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Tue, 17 Jan 2017 19:36:26 -0800
Subject: [PATCH 4/8] Bend edges

---
 abp/static/scripts/materials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/abp/static/scripts/materials.js b/abp/static/scripts/materials.js
index d0ee18d..60dbfb5 100644
--- a/abp/static/scripts/materials.js
+++ b/abp/static/scripts/materials.js
@@ -1,8 +1,8 @@
 var materials = {};
 
 var curveProperties = {
-    splineDensity: 1,
-    curvature: 20
+    splineDensity: 20,
+    curvature: 3
 };
 
 // Is called on boot

From 14193a8a534ca8427f95ac59b4bf08f66eb48d60 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Tue, 17 Jan 2017 19:40:11 -0800
Subject: [PATCH 5/8] =?UTF-8?q?Bump=20version:=200.4.25=20=E2=86=92=200.4.?=
 =?UTF-8?q?26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg           | 2 +-
 README.md                  | 4 ++--
 abp/static/index.html      | 2 +-
 abp/static/scripts/main.js | 2 +-
 bin/abpserver              | 2 +-
 doc/conf.py                | 4 ++--
 doc/index.rst              | 2 +-
 setup.py                   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7e586fc..c13b710 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.25
+current_version = 0.4.26
 commit = True
 tag = True
 
diff --git a/README.md b/README.md
index 05d4e73..89c0844 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# abp 0.4.25
+# abp 0.4.26
 Python port of Anders and Briegel' s [method](https://arxiv.org/abs/quant-ph/0504117) for fast simulation of Clifford circuits. 
 
 ## Documentation
@@ -8,7 +8,7 @@ You can read the full documentation [here](https://peteshadbolt.co.uk/abp/). You
 It's easiest to install with `pip`:
 
 ```shell
-$ pip install --user abp==0.4.25
+$ pip install --user abp==0.4.26
 ```
 
 Or clone and install in `develop` mode:
diff --git a/abp/static/index.html b/abp/static/index.html
index 1dfd0ff..4b53578 100644
--- a/abp/static/index.html
+++ b/abp/static/index.html
@@ -24,7 +24,7 @@
 <div id=node_info class=hidden> nothing </div>
 <div id=server_info class=hidden> </div>
 
-<div id=version>Version 0.4.25</div>
+<div id=version>Version 0.4.26</div>
 
 <div id=node_data class=hidden>
     <div id=node_name></div>
diff --git a/abp/static/scripts/main.js b/abp/static/scripts/main.js
index 6e8cd0c..a9e237c 100644
--- a/abp/static/scripts/main.js
+++ b/abp/static/scripts/main.js
@@ -1,4 +1,4 @@
-console.log("abp v0.4.25");
+console.log("abp v0.4.26");
 
 window.onload = function() {
     graph.prepare();
diff --git a/bin/abpserver b/bin/abpserver
index 5079d2b..2289a21 100755
--- a/bin/abpserver
+++ b/bin/abpserver
@@ -81,7 +81,7 @@ if __name__ == '__main__':
 
     # Change to the right working dir
     where = os.path.abspath(resource_filename("abp.static", ""))
-    print "abpserver 0.4.25"
+    print "abpserver 0.4.26"
     print where
     print "Open http://localhost:5001 in a browser!"
     os.chdir(where)
diff --git a/doc/conf.py b/doc/conf.py
index 6bdcf18..f4eb709 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -60,9 +60,9 @@ author = u'Pete Shadbolt'
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.25'
+version = '0.4.26'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.25'
+release = '0.4.26'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/index.rst b/doc/index.rst
index 9247e33..06000c0 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -26,7 +26,7 @@ You can install from ``pip``:
 
 .. code-block:: bash
 
-   $ pip install --user abp==0.4.25
+   $ pip install --user abp==0.4.26
 
 Alternatively, clone from the `github repo <https://github.com/peteshadbolt/abp>`_ and run ``setup.py``:
 
diff --git a/setup.py b/setup.py
index 15ba5b9..d793db1 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ STATIC = glob("abp/static/*.*")+glob("abp/static/img/*.*")+glob("abp/static/scri
 
 setup(
     name = "abp",
-    version = "0.4.25",
+    version = "0.4.26",
     packages = ["abp", "abp.static"],
     test_suite = "tests",
     author = "Pete Shadbolt",

From 472eac2c6ab338583e90a847268f81d35cbe8325 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Tue, 17 Jan 2017 20:10:08 -0800
Subject: [PATCH 6/8] Thicker, bendier edges.

---
 abp/static/scripts/materials.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/abp/static/scripts/materials.js b/abp/static/scripts/materials.js
index 60dbfb5..2c2c575 100644
--- a/abp/static/scripts/materials.js
+++ b/abp/static/scripts/materials.js
@@ -1,8 +1,8 @@
 var materials = {};
 
 var curveProperties = {
-    splineDensity: 20,
-    curvature: 3
+    splineDensity: 10,
+    curvature: 20
 };
 
 // Is called on boot
@@ -12,7 +12,7 @@ materials.prepare = function() {
     materials.edge = new THREE.LineBasicMaterial({
         color: "gray",
         transparent: false,
-        linewidth: 3
+        linewidth: 5
     });
     materials.edge.depthTest = false;
     materials.qubit = new THREE.PointsMaterial({

From 67dab6325095170ce531857c981fbc5f087cb1c8 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Tue, 17 Jan 2017 20:10:08 -0800
Subject: [PATCH 7/8] Thicker, bendier edges.

---
 abp/static/scripts/materials.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/abp/static/scripts/materials.js b/abp/static/scripts/materials.js
index 60dbfb5..2c2c575 100644
--- a/abp/static/scripts/materials.js
+++ b/abp/static/scripts/materials.js
@@ -1,8 +1,8 @@
 var materials = {};
 
 var curveProperties = {
-    splineDensity: 20,
-    curvature: 3
+    splineDensity: 10,
+    curvature: 20
 };
 
 // Is called on boot
@@ -12,7 +12,7 @@ materials.prepare = function() {
     materials.edge = new THREE.LineBasicMaterial({
         color: "gray",
         transparent: false,
-        linewidth: 3
+        linewidth: 5
     });
     materials.edge.depthTest = false;
     materials.qubit = new THREE.PointsMaterial({

From c9121351c61ed94ad9615581cbb277185b844f84 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <hello@peteshadbolt.co.uk>
Date: Thu, 19 Jan 2017 19:52:23 -0800
Subject: [PATCH 8/8] Blindly ran 2to3 against all python files.

---
 abp/build_tables.py                      | 18 +++++++++---------
 abp/clifford.py                          | 10 +++++-----
 abp/graphstate.py                        | 24 ++++++++++++------------
 abp/nxgraphstate.py                      | 12 ++++++------
 abp/qi.py                                |  6 +++---
 abp/stabilizer.py                        |  7 ++++---
 abp/vizclient.py                         | 10 +++++-----
 tests/mock.py                            | 16 ++++++++--------
 tests/test_against_anders_and_briegel.py | 24 ++++++++++++------------
 tests/test_clifford.py                   |  6 +++---
 tests/test_graphstate.py                 | 14 +++++++-------
 tests/test_measurement.py                |  2 +-
 tests/test_mercedes.py                   |  2 +-
 tests/test_qi.py                         |  6 +++---
 tests/test_stabilizer.py                 |  8 ++++----
 15 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/abp/build_tables.py b/abp/build_tables.py
index e73440d..1f7e668 100644
--- a/abp/build_tables.py
+++ b/abp/build_tables.py
@@ -9,7 +9,7 @@ import itertools as it
 from functools import reduce
 from os.path import dirname, join, split
 import json
-import qi, clifford
+from . import qi, clifford
 
 
 DECOMPOSITIONS = (
@@ -52,8 +52,8 @@ def find_cz(bond, c1, c2, commuters, state_table):
     target = qi.normalize_global_phase(target)
 
     # Choose the sets to search over
-    s1 = commuters if c1 in commuters else xrange(24)
-    s2 = commuters if c2 in commuters else xrange(24)
+    s1 = commuters if c1 in commuters else range(24)
+    s2 = commuters if c2 in commuters else range(24)
 
     # Find a match
     for bondp, c1p, c2p in it.product([0, 1], s1, s2):
@@ -79,9 +79,9 @@ def get_unitaries():
 def get_by_name(unitaries, conjugation_table):
     """ Get a lookup table of cliffords by name """
     a = {name: find_clifford(u, unitaries)
-         for name, u in qi.by_name.items()}
+         for name, u in list(qi.by_name.items())}
     a.update({key + "_h": conjugation_table[value]
-              for key, value in a.items()})
+              for key, value in list(a.items())})
     a.update({clifford.get_name(i): i for i in range(24)})
     a.update({i: i for i in range(24)})
     return a
@@ -101,7 +101,7 @@ def get_times_table(unitaries):
 def get_state_table(unitaries):
     """ Cache a table of state to speed up a little bit """
     state_table = np.zeros((2, 24, 24, 4), dtype=complex)
-    params = list(it.product([0, 1], range(24), range(24)))
+    params = list(it.product([0, 1], list(range(24)), list(range(24))))
     for bond, i, j in tqdm(params, desc="Building state table"):
         state = qi.bond if bond else qi.nobond
         kp = np.kron(unitaries[i], unitaries[j])
@@ -137,7 +137,7 @@ def get_measurement_table():
     This is pretty unintelligible right now, we should probably compute the phase from unitaries instead
     """
     measurement_table = np.zeros((4, 24, 2), dtype=int)
-    for operator, unitary in it.product(range(4), range(24)):
+    for operator, unitary in it.product(list(range(4)), list(range(24))):
         measurement_table[operator, unitary] = get_measurement_entry(
             operator, unitary)
     return measurement_table
@@ -158,7 +158,7 @@ def get_cz_table(unitaries):
     # And now build the CZ table
     cz_table = np.zeros((2, 24, 24, 3), dtype=int)
     rows = list(
-        it.product([0, 1], it.combinations_with_replacement(range(24), 2)))
+        it.product([0, 1], it.combinations_with_replacement(list(range(24)), 2)))
     # CZ is symmetric so we only need combinations
     for bond, (c1, c2) in tqdm(rows, desc="Building CZ table"):
         newbond, c1p, c2p = find_cz(
@@ -174,7 +174,7 @@ def get_display_table(unitaries):
         c = qi.CircuitModel(1)
         c.act_local_rotation(0, u)
         state = c.state.round(2)
-        print "{:.2f}, {:.2f}".format(state[0][0], state[1][0])
+        print("{:.2f}, {:.2f}".format(state[0][0], state[1][0]))
 
 
 def compute_everything():
diff --git a/abp/clifford.py b/abp/clifford.py
index 8ed09de..64a29c9 100644
--- a/abp/clifford.py
+++ b/abp/clifford.py
@@ -40,7 +40,7 @@ The complete set of aliases for single-qubit Cliffords is as follows:
 
 """
 
-from tables import *
+from .tables import *
 
 # Aliases
 identity = by_name["identity"]
@@ -58,7 +58,7 @@ def conjugate(operator, unitary):
 def use_old_cz():
     """ Use the CZ lookup table from A&B's code, rather than our own. Useful for testing. """
     global cz_table
-    from anders_cz import cz_table
+    from .anders_cz import cz_table
 
 def get_name(i):
     """ Get the name of this clifford """
@@ -66,7 +66,7 @@ def get_name(i):
 
 def human_name(i):
     """ Get the human-readable name of this clifford - slow """
-    choices = sorted((key for key, value in by_name.items() if value == i), key=len)
+    choices = sorted((key for key, value in list(by_name.items()) if value == i), key=len)
     return choices[-1]
 
 def is_diagonal(v):
@@ -78,9 +78,9 @@ if __name__ == '__main__':
     from itertools import groupby
 
     for i in range(24):
-        members = [key for key, value in by_name.items() if value == i and str(key)!=str(i)]
+        members = [key for key, value in list(by_name.items()) if value == i and str(key)!=str(i)]
         members = sorted(members, key=len)
-        print "* {}: {}".format(i, ", ".join(members))
+        print("* {}: {}".format(i, ", ".join(members)))
             
 
 
diff --git a/abp/graphstate.py b/abp/graphstate.py
index 6ef23d4..a206075 100755
--- a/abp/graphstate.py
+++ b/abp/graphstate.py
@@ -6,9 +6,9 @@ This module implements Anders and Briegel's method for fast simulation of Cliffo
 
 import itertools as it
 import json, random
-import qi, clifford, util
+from . import qi, clifford, util
 import abp
-from stabilizer import Stabilizer
+from .stabilizer import Stabilizer
 
 
 class GraphState(object):
@@ -30,7 +30,7 @@ class GraphState(object):
             # Cloning from a networkx graph
             self.adj = data.adj.copy()
             self.node = data.node.copy()
-            for key, value in self.node.items():
+            for key, value in list(self.node.items()):
                 self.node[key]["vop"] = data.node[
                     key].get("vop", clifford.identity)
         except AttributeError:
@@ -66,7 +66,7 @@ class GraphState(object):
         By default, nodes are initialized with ``vop=``:math:`I`, i.e. they are in the :math:`|+\\rangle` state.
         """
         if node in self.node:
-            print "Warning: node {} already exists".format(node)
+            print("Warning: node {} already exists".format(node))
             return
 
         default = kwargs.get("default", "identity")
@@ -141,7 +141,7 @@ class GraphState(object):
     def edgelist(self):
         """ Describe a graph as an edgelist # TODO: inefficient """
         edges = set(tuple(sorted((i, n)))
-                    for i, v in self.adj.items()
+                    for i, v in list(self.adj.items())
                     for n in v)
         return tuple(edges)
 
@@ -305,7 +305,7 @@ class GraphState(object):
         """
         forces = forces if forces != None else [
             random.choice([0, 1]) for i in range(len(measurements))]
-        measurements = zip(measurements, forces)
+        measurements = list(zip(measurements, forces))
         results = []
         for (node, basis), force in measurements:
             result = self.measure(node, basis, force, detail)
@@ -333,9 +333,9 @@ class GraphState(object):
             if abp.DETERMINISTIC:
                 friend = sorted(self.adj[node].keys())[0]
             else:
-                friend = next(self.adj[node].iterkeys())
+                friend = next(iter(self.adj[node].keys()))
         else:
-            assert friend in self.adj[node].keys()  # TODO: unnecessary assert
+            assert friend in list(self.adj[node].keys())  # TODO: unnecessary assert
 
         # Update the VOPs. TODO: pretty ugly
         if result:
@@ -427,9 +427,9 @@ class GraphState(object):
 
         """
         if stringify:
-            node = {str(key): value for key, value in self.node.items()}
-            adj = {str(key): {str(key): value for key, value in ngbh.items()}
-                   for key, ngbh in self.adj.items()}
+            node = {str(key): value for key, value in list(self.node.items())}
+            adj = {str(key): {str(key): value for key, value in list(ngbh.items())}
+                   for key, ngbh in list(self.adj.items())}
             return {"node": node, "adj": adj}
         else:
             return {"node": self.node, "adj": self.adj}
@@ -460,7 +460,7 @@ class GraphState(object):
             state.act_hadamard(mapping[n])
         for i, j in self.edgelist():
             state.act_cz(mapping[i], mapping[j])
-        for i, n in self.node.items():
+        for i, n in list(self.node.items()):
             state.act_local_rotation(mapping[i], clifford.unitaries[n["vop"]])
         return state
 
diff --git a/abp/nxgraphstate.py b/abp/nxgraphstate.py
index 2c8d957..090b262 100644
--- a/abp/nxgraphstate.py
+++ b/abp/nxgraphstate.py
@@ -1,8 +1,8 @@
 import networkx as nx
 import numpy as np
-import graphstate
-import clifford
-import util
+from . import graphstate
+from . import clifford
+from . import util
 
 class NXGraphState(graphstate.GraphState, nx.Graph):
     """ This is GraphState with NetworkX-like abilities """
@@ -12,8 +12,8 @@ class NXGraphState(graphstate.GraphState, nx.Graph):
     def layout(self):
         """ Automatically lay out the graph """
         pos = nx.spring_layout(self, dim=3, scale=np.sqrt(self.order()))
-        middle = np.average(pos.values(), axis=0)
-        pos = {key: value - middle for key, value in pos.items()}
-        for key, (x, y, z) in pos.items():
+        middle = np.average(list(pos.values()), axis=0)
+        pos = {key: value - middle for key, value in list(pos.items())}
+        for key, (x, y, z) in list(pos.items()):
             self.node[key]["position"] = util.xyz(x, y, z)
 
diff --git a/abp/qi.py b/abp/qi.py
index 4d760f5..0ff1d6e 100644
--- a/abp/qi.py
+++ b/abp/qi.py
@@ -52,7 +52,7 @@ nobond = np.kron(plus, plus)
 # Labelling stuff
 common_us = id, px, py, pz, ha, ph, sqz, msqz, sqy, msqy, sqx, msqx
 names = "identity", "px", "py", "pz", "hadamard", "phase", "sqz", "msqz", "sqy", "msqy", "sqx", "msqx"
-by_name = dict(zip(names, common_us))
+by_name = dict(list(zip(names, common_us)))
 
 paulis = px, py, pz
 operators = id, px, py, pz
@@ -60,7 +60,7 @@ operators = id, px, py, pz
 
 def normalize_global_phase(m):
     """ Normalize the global phase of a matrix """
-    v = (x for x in m.flatten() if np.abs(x) > 0.001).next()
+    v = next((x for x in m.flatten() if np.abs(x) > 0.001))
     phase = np.arctan2(v.imag, v.real) % np.pi
     rot = np.exp(-1j * phase)
     return rot * m if rot * v > 0 else -rot * m
@@ -78,7 +78,7 @@ class CircuitModel(object):
         """ Act a CU somewhere. """
         control = 1 << control
         target = 1 << target
-        for i in xrange(self.d):
+        for i in range(self.d):
             if (i & control) and (i & target):
                 self.state[i, 0] *= -1
 
diff --git a/abp/stabilizer.py b/abp/stabilizer.py
index 236ce35..7e0c38e 100644
--- a/abp/stabilizer.py
+++ b/abp/stabilizer.py
@@ -31,15 +31,16 @@ class Stabilizer(object):
         """ For comparison with old A&B code """
         m = {1: 0, 1j:1, -1: 2, -1j: 3}
         return {"paulis": self.tableau,
-                "phases": {key: m[value] for key, value in self.phases.items()}}
+                "phases": {key: m[value] for key, value in list(self.phases.items())}}
 
-    def __getitem__(self, (i, j)):
+    def __getitem__(self, xxx_todo_changeme):
         """" Pass straight through to the dictionary """
+        (i, j) = xxx_todo_changeme
         return self.tableau[i][j]
 
     def __str__(self):
         """ Represent as a string """
-        keys = map(str, self.tableau.keys())
+        keys = list(map(str, list(self.tableau.keys())))
         w = max(len(k) for k in keys)
         keys = [k.ljust(w) for k in keys]
         s = "   {}\n".format("  ".join(map(str, keys)))
diff --git a/abp/vizclient.py b/abp/vizclient.py
index 0a89c11..7148f75 100644
--- a/abp/vizclient.py
+++ b/abp/vizclient.py
@@ -3,9 +3,9 @@ import networkx as nx
 import numpy as np
 import websocket
 from socket import error as socket_error
-import clifford
-import util
-import nxgraphstate
+from . import clifford
+from . import util
+from . import nxgraphstate
 
 class VizClient(object):
     def __init__(self, uri = "ws://localhost:5000"):
@@ -21,7 +21,7 @@ class VizClient(object):
         g = nxgraphstate.NXGraphState(graph)
 
         # Automatically perform layout if position is not provided
-        if not all(("position" in node) for node in g.node.values()):
+        if not all(("position" in node) for node in list(g.node.values())):
             g.layout()
 
         # Send data to browser and rate-limit
@@ -29,7 +29,7 @@ class VizClient(object):
             self.ws.send(json.dumps(g.to_json(stringify=True)))
             self.ws.recv()
         except websocket._exceptions.WebSocketTimeoutException:
-            print "Timed out ... you might be pushing a bit hard"
+            print("Timed out ... you might be pushing a bit hard")
         time.sleep(delay)
 
 
diff --git a/tests/mock.py b/tests/mock.py
index 642040c..5de075a 100644
--- a/tests/mock.py
+++ b/tests/mock.py
@@ -21,7 +21,7 @@ class AndersWrapper(graphsim.GraphRegister):
     """ A wrapper for A&B to make the interface identical and enable equality testing """
 
     def __init__(self, nodes):
-        assert list(nodes) == range(len(nodes))
+        assert list(nodes) == list(range(len(nodes)))
         super(AndersWrapper, self).__init__(len(nodes))
 
     def act_local_rotation(self, qubit, operation):
@@ -58,7 +58,7 @@ class ABPWrapper(GraphState):
         super(ABPWrapper, self).__init__(nodes, vop="hadamard")
 
     def print_stabilizer(self):
-        print self.to_stabilizer()
+        print(self.to_stabilizer())
 
     def __eq__(self, other):
         return self.to_json() == other.to_json()
@@ -67,7 +67,7 @@ class ABPWrapper(GraphState):
 class CircuitModelWrapper(qi.CircuitModel):
 
     def __init__(self, nodes=[]):
-        assert list(nodes) == range(len(nodes))
+        assert list(nodes) == list(range(len(nodes)))
         super(CircuitModelWrapper, self).__init__(len(nodes))
 
     def act_circuit(self, circuit):
@@ -82,19 +82,19 @@ class CircuitModelWrapper(qi.CircuitModel):
 
 def random_pair(n):
     """ Helper function to get random pairs"""
-    return tuple(random.choice(range(n), 2, replace=False))
+    return tuple(random.choice(list(range(n)), 2, replace=False))
 
 
 def random_graph_circuit(n=10, depth=100):
     """ A random Graph state. """
-    return [(i, "hadamard") for i in xrange(n)] + \
-           [(random_pair(n), "cz") for i in xrange(depth)]
+    return [(i, "hadamard") for i in range(n)] + \
+           [(random_pair(n), "cz") for i in range(depth)]
 
 
 def random_stabilizer_circuit(n=10, depth=100):
     """ Generate a random stabilizer state, without any VOPs """
     return random_graph_circuit(n, depth) + \
-        [(i, random.choice(range(24))) for i in range(n)]
+        [(i, random.choice(list(range(24)))) for i in range(n)]
 
 
 def bell_pair():
@@ -122,7 +122,7 @@ def simple_graph():
 
 def circuit_to_state(Base, n, circuit):
     """ Convert a circuit to a state, given a base class """
-    g = Base(range(n))
+    g = Base(list(range(n)))
     g.act_circuit(circuit)
     return g
 
diff --git a/tests/test_against_anders_and_briegel.py b/tests/test_against_anders_and_briegel.py
index 3c8dc1a..6c25ed3 100644
--- a/tests/test_against_anders_and_briegel.py
+++ b/tests/test_against_anders_and_briegel.py
@@ -17,48 +17,48 @@ def test_hadamard():
 
 def test_local_rotations():
     """ Test local rotations """
-    for i in tqdm(range(REPEATS), "Testing local rotations"):
-        circuit = [(0, random.choice(range(24))) for j in range(DEPTH)]
+    for i in tqdm(list(range(REPEATS)), "Testing local rotations"):
+        circuit = [(0, random.choice(list(range(24)))) for j in range(DEPTH)]
         mock.test_circuit(circuit, 1)
 
 
 def test_times_table():
     """ Test times table """
-    for i, j in it.product(range(24), range(24)):
+    for i, j in it.product(list(range(24)), list(range(24))):
         circuit = [(0, i), (0, j)]
         mock.test_circuit(circuit, 1)
 
 
 def test_cz_table():
     """ Test the CZ table """
-    for i, j in it.product(range(24), range(24)):
+    for i, j in it.product(list(range(24)), list(range(24))):
         circuit = [(0, i), (1, j), ((0, 1), "cz")]
         mock.test_circuit(circuit, 2)
 
 
 def test_cz_hadamard(n=10):
     """ Test CZs and Hadamards at random """
-    for i in tqdm(range(REPEATS), desc="Testing CZ and Hadamard against A&B"):
+    for i in tqdm(list(range(REPEATS)), desc="Testing CZ and Hadamard against A&B"):
         circuit = random.choice(["cz", "hadamard"], DEPTH)
         circuit = [(mock.random_pair(n), gate) if gate == "cz"
-                   else (random.choice(range(n)), gate)
+                   else (random.choice(list(range(n))), gate)
                    for gate in circuit]
         mock.test_circuit(circuit, n)
 
 
 def test_all(n=10):
     """ Test everything """
-    for i in tqdm(range(REPEATS), desc="Testing CZ and Hadamard against A&B"):
-        circuit = random.choice(["cz"] * 10 + range(24), DEPTH)
+    for i in tqdm(list(range(REPEATS)), desc="Testing CZ and Hadamard against A&B"):
+        circuit = random.choice(["cz"] * 10 + list(range(24)), DEPTH)
         circuit = [(mock.random_pair(n), gate) if gate == "cz"
-                   else (random.choice(range(n)), gate)
+                   else (random.choice(list(range(n))), gate)
                    for gate in circuit]
         mock.test_circuit(circuit, n)
 
 
 def test_single_qubit_measurement():
     """ Determinstic test of all single-qubit situations """
-    space = it.product(range(24), PAULIS, (0, 1))
+    space = it.product(list(range(24)), PAULIS, (0, 1))
     for rotation, measurement, outcome in tqdm(space, "Testing single qubit measurements"):
         a = mock.circuit_to_state(mock.ABPWrapper, 1, [(0, rotation)])
         b = mock.circuit_to_state(mock.AndersWrapper, 1, [(0, rotation)])
@@ -79,7 +79,7 @@ def test_two_qubit_measurement():
                 
 def test_graph_state_measurement(n = 10):
     """ Measuring random graph states """
-    space = list(it.product(range(REPEATS), PAULIS, (0, 1)))
+    space = list(it.product(list(range(REPEATS)), PAULIS, (0, 1)))
     for i, measurement, outcome in tqdm(space, "Measuring random graph states"):
         circuit = mock.random_graph_circuit(n, DEPTH)
         a = mock.circuit_to_state(mock.ABPWrapper, n, circuit)
@@ -90,7 +90,7 @@ def test_graph_state_measurement(n = 10):
 
 def test_stabilizer_state_measurement(n = 10):
     """ Measuring random stabilizer states """
-    space = list(it.product(range(REPEATS), PAULIS, (0, 1)))
+    space = list(it.product(list(range(REPEATS)), PAULIS, (0, 1)))
     for i, measurement, outcome in tqdm(space, "Measuring random stabilizer states"):
         circuit = mock.random_stabilizer_circuit(n, DEPTH)
         a = mock.circuit_to_state(mock.ABPWrapper, n, circuit)
diff --git a/tests/test_clifford.py b/tests/test_clifford.py
index fea5a66..657d040 100644
--- a/tests/test_clifford.py
+++ b/tests/test_clifford.py
@@ -45,7 +45,7 @@ def test_we_have_24_matrices():
 
 def test_we_have_all_useful_gates():
     """ Check that all the interesting gates are included up to a global phase """
-    for name, u in qi.by_name.items():
+    for name, u in list(qi.by_name.items()):
         build_tables.find_clifford(u, clifford.unitaries)
 
 
@@ -85,7 +85,7 @@ def test_conjugation():
         raise nose.SkipTest("Original C++ is not available, skipping test")
         
 
-    for operation_index, transform_index in it.product(range(4), range(24)):
+    for operation_index, transform_index in it.product(list(range(4)), list(range(24))):
         transform = graphsim.LocCliffOp(transform_index)
         operation = graphsim.LocCliffOp(operation_index)
 
@@ -103,7 +103,7 @@ def test_cz_table():
     """ Does the CZ code work good? """
     state_table = build_tables.get_state_table(clifford.unitaries)
 
-    rows = it.product([0, 1], it.combinations_with_replacement(range(24), 2))
+    rows = it.product([0, 1], it.combinations_with_replacement(list(range(24)), 2))
 
     for bond, (c1, c2) in rows:
 
diff --git a/tests/test_graphstate.py b/tests/test_graphstate.py
index f307d70..c2f6280 100644
--- a/tests/test_graphstate.py
+++ b/tests/test_graphstate.py
@@ -65,9 +65,9 @@ def test_edgelist():
 def test_stress(n=int(1e5)):
     """ Testing that making a graph of ten thousand qubits takes less than half a second"""
     import time
-    g = GraphState(range(n + 1), vop="hadamard")
+    g = GraphState(list(range(n + 1)), vop="hadamard")
     t = time.clock()
-    for i in xrange(n):
+    for i in range(n):
         g._add_edge(i, i + 1)
     assert time.clock() - t < .5
 
@@ -93,7 +93,7 @@ def test_czs():
 def test_local_complementation():
     """ Test that local complementation works okay """
     pairs = (0, 1), (0, 3), (1, 3), (1, 2), 
-    psi = GraphState(range(4), vop="hadamard")
+    psi = GraphState(list(range(4)), vop="hadamard")
     psi.act_circuit([("hadamard", i) for i in psi.node])
     psi.act_circuit([("cz", pair) for pair in pairs])
     old_edges = psi.edgelist()
@@ -105,8 +105,8 @@ def test_local_complementation():
 
 def test_single_qubit():
     """ A multi qubit test with Hadamards only"""
-    for repeat in tqdm(range(REPEATS), desc="Single qubit rotations against CircuitModel"):
-        circuit = [(0, random.choice(range(24))) for i in range(DEPTH)]
+    for repeat in tqdm(list(range(REPEATS)), desc="Single qubit rotations against CircuitModel"):
+        circuit = [(0, random.choice(list(range(24)))) for i in range(DEPTH)]
         a = mock.circuit_to_state(mock.ABPWrapper, 1, circuit)
         b = mock.circuit_to_state(mock.CircuitModelWrapper, 1, circuit)
         assert a.to_state_vector() == b
@@ -114,7 +114,7 @@ def test_single_qubit():
 
 def test_graph_state_multiqubit(n=6):
     """ A multi qubit test with Hadamards only"""
-    for repeat in tqdm(range(REPEATS), desc="Random graph states against the CircuitModel"):
+    for repeat in tqdm(list(range(REPEATS)), desc="Random graph states against the CircuitModel"):
         circuit = mock.random_graph_circuit(n)
         a = mock.circuit_to_state(mock.ABPWrapper, n, circuit)
         b = mock.circuit_to_state(mock.CircuitModelWrapper, n, circuit)
@@ -123,7 +123,7 @@ def test_graph_state_multiqubit(n=6):
 
 def test_stabilizer_state_multiqubit(n=6):
     """ A multi qubit test with arbitrary local rotations """
-    for repeat in tqdm(range(REPEATS), desc="Random Clifford circuits against the CircuitModel"):
+    for repeat in tqdm(list(range(REPEATS)), desc="Random Clifford circuits against the CircuitModel"):
         circuit = mock.random_stabilizer_circuit(n)
         a = mock.circuit_to_state(mock.ABPWrapper, n, circuit)
         b = mock.circuit_to_state(mock.CircuitModelWrapper, n, circuit)
diff --git a/tests/test_measurement.py b/tests/test_measurement.py
index 5cafcaf..b4ab1d3 100644
--- a/tests/test_measurement.py
+++ b/tests/test_measurement.py
@@ -29,7 +29,7 @@ def test_single_qubit_measurements():
 
 def test_type():
     """ Test that the output is always an int """
-    for r, m, f in it.product(range(24), ("px", "py", "pz"), (0, 1)):
+    for r, m, f in it.product(list(range(24)), ("px", "py", "pz"), (0, 1)):
         g = GraphState([0], vop="hadamard")
         g.act_local_rotation(0, r)
         assert str(g.measure(0, m)) in "01"
diff --git a/tests/test_mercedes.py b/tests/test_mercedes.py
index 548193e..bcfe2a1 100644
--- a/tests/test_mercedes.py
+++ b/tests/test_mercedes.py
@@ -3,7 +3,7 @@ from abp.util import xyz
 from mock import simple_graph
 
 def linear_cluster(n):
-    g = GraphState(range(n), vop="hadamard")
+    g = GraphState(list(range(n)), vop="hadamard")
     g.act_circuit([("hadamard", i) for i in range(n)])
     g.act_circuit([("cz", (i, i+1)) for i in range(n-1)])
     return g 
diff --git a/tests/test_qi.py b/tests/test_qi.py
index 9add17b..8f61c2e 100644
--- a/tests/test_qi.py
+++ b/tests/test_qi.py
@@ -135,7 +135,7 @@ def test_against_chp(n=5):
         ket = chp.get_ket()
         nonzero = np.sqrt(len(ket))
         output.state[0, 0] = 0
-        for key, phase in ket.items():
+        for key, phase in list(ket.items()):
             output.state[key] = np.exp(1j * phase * np.pi / 2) / nonzero
         return output
 
@@ -151,7 +151,7 @@ def test_against_chp(n=5):
     # Run a random circuit
     chp.init(n)
     psi = qi.CircuitModel(n)
-    for i in tqdm(range(DEPTH), "Testing CircuitModel against CHP"):
+    for i in tqdm(list(range(DEPTH)), "Testing CircuitModel against CHP"):
         if np.random.rand() > .5:
             a = np.random.randint(0, n - 1)
             chp.act_hadamard(a)
@@ -166,7 +166,7 @@ def test_against_chp(n=5):
 def test_sqrt_notation(n=2):
     """ Test that SQRT notation looks nice """
     c = mock.random_stabilizer_circuit(n)
-    g = GraphState(range(n))
+    g = GraphState(list(range(n)))
     g.act_circuit(c)
 
 def test_indexint():
diff --git a/tests/test_stabilizer.py b/tests/test_stabilizer.py
index 1d5fca8..3bf43f2 100644
--- a/tests/test_stabilizer.py
+++ b/tests/test_stabilizer.py
@@ -7,13 +7,13 @@ REPEATS = 1000
 def test_stabilizers_against_anders_and_briegel(n=10):
     """ Test that stabilizers are line-for-line equivalent """
     
-    for i in tqdm(range(REPEATS), "Stabilizer representation VS A&B"):
+    for i in tqdm(list(range(REPEATS)), "Stabilizer representation VS A&B"):
         c = mock.random_stabilizer_circuit(n)
-        g = mock.AndersWrapper(range(n))
+        g = mock.AndersWrapper(list(range(n)))
         g.act_circuit(c)
         da = g.get_full_stabilizer().to_dictionary()
 
-        g = mock.ABPWrapper(range(n))
+        g = mock.ABPWrapper(list(range(n)))
         g.act_circuit(c)
         db = g.to_stabilizer().to_dictionary()
 
@@ -21,4 +21,4 @@ def test_stabilizers_against_anders_and_briegel(n=10):
 
 def test_stabilizer_access():
     g = GraphState(3)
-    print g.to_stabilizer()[0, 0]
+    print(g.to_stabilizer()[0, 0])