Merge pull request #63 from SpiNNakerManchester/dict

use normal dict rather than ordered dict

spalloc/scripts/alloc.py

@@ -111,7 +111,6 @@
 sent. Adding the ``--keepalive -1`` option when creating a job disables this.
 """
 import argparse
-from collections import OrderedDict
 import logging
 import os
 import subprocess
@@ -168,7 +167,7 @@ def print_info(machine_name, connections, width, height, ip_file_filename):
     """
     t_stdout = Terminal()
 
-    to_print = OrderedDict()
+    to_print = dict()
 
     to_print["Hostname"] = t_stdout.bright(connections[(0, 0)])
     to_print["Width"] = width

spalloc/scripts/job.py

@@ -75,7 +75,6 @@
     their boards being powered down and re-partitioned ready for another user.
 """
 import argparse
-from collections import OrderedDict
 import sys
 from spalloc import __version__, JobState
 from spalloc.term import (
@@ -110,7 +109,7 @@ def show_job_info(t, client, timeout, job_id):
     # Get the complete job information (if the job is alive)
     job_list = client.list_jobs(timeout=timeout)
     job = [job for job in job_list if job["job_id"] == job_id]
-    info = OrderedDict()
+    info = dict()
     info["Job ID"] = job_id
 
     if not job:

spalloc/scripts/machine.py

@@ -30,8 +30,8 @@
 If the ``--watch`` option is given, the information displayed is updated in
 real-time.
 """
+from collections import defaultdict
 import argparse
-from collections import defaultdict, OrderedDict
 import sys
 from spalloc import __version__
 from spalloc.term import (
@@ -149,7 +149,7 @@ def show_machine(t, machines, jobs, machine_name, compact=False):
     num_in_use = sum(map(len, (job["boards"] for job in displayed_jobs)))
 
     # Show general machine information
-    info = OrderedDict()
+    info = dict()
     info["Name"] = machine["name"]
     info["Tags"] = ", ".join(machine["tags"])
     info["In-use"] = "{} of {}".format(num_in_use, num_boards)

spalloc/scripts/where_is.py

@@ -67,7 +67,6 @@
 """
 import sys
 import argparse
-from collections import OrderedDict
 from spalloc import __version__
 from spalloc.term import render_definitions
 from .support import Terminate, Script
@@ -145,7 +144,7 @@ def body(self, client, args):  # @UnusedVariable
         if location is None:
             raise Terminate(4, "No boards at the specified location")
 
-        out = OrderedDict()
+        out = dict()
         out["Machine"] = location["machine"]
         out["Physical location"] = "Cabinet {}, Frame {}, Board {}".format(
             *location["physical"])

tests/test_term.py

@@ -13,7 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from collections import OrderedDict
 import pytest
 from spalloc.term import (
     Terminal, render_table, render_definitions, render_boards, render_cells,
@@ -185,13 +184,13 @@ def test_render_table():
 
 def test_render_definitions():
     # Empty case
-    assert render_definitions(OrderedDict()) == ""
+    assert render_definitions(dict()) == ""
 
     # Singleton
-    assert render_definitions(OrderedDict([("foo", "bar")])) == "foo: bar"
+    assert render_definitions(dict([("foo", "bar")])) == "foo: bar"
 
     # Ragged
-    assert render_definitions(OrderedDict([
+    assert render_definitions(dict([
         ("Key", "Value"),
         ("Something", "Else"),
         ("Another", "Thing"),
@@ -200,7 +199,7 @@ def test_render_definitions():
             "  Another: Thing")
 
     # Alternative seperator
-    assert render_definitions(OrderedDict([("foo", "bar")]),
+    assert render_definitions(dict([("foo", "bar")]),
                               seperator="=") == "foo=bar"
     # Linebreaks
     assert render_definitions({"Key": "Lines\nBroken\nUp."}) == (