bdd: remove OrderedDict

dicts are guaranteed to keep insertion order by since Python 3.7, making
use of ORderedDict mute.

diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py
index b493f013293fbaf749fc7b9d0b95ba92ee12fbfb..dcce1b5865dddd23c917f34286289ca675bf76d8 100644 (file)
--- a/test/bdd/steps/http_responses.py
+++ b/test/bdd/steps/http_responses.py
@@ -7,7 +7,6 @@
 """
 Classes wrapping HTTP responses from the Nominatim API.
 """
 """
 Classes wrapping HTTP responses from the Nominatim API.
 """

-from collections import OrderedDict

 import re
 import json
 import xml.etree.ElementTree as ET
 import re
 import json
 import xml.etree.ElementTree as ET


@@ -70,8 +69,8 @@ class GenericResponse:
         else:
             code = m.group(2)
             self.header['json_func'] = m.group(1)
         else:
             code = m.group(2)
             self.header['json_func'] = m.group(1)

-        self.result = json.JSONDecoder(object_pairs_hook=OrderedDict).decode(code)
-        if isinstance(self.result, OrderedDict):
+        self.result = json.JSONDecoder().decode(code)
+        if isinstance(self.result, dict):

             if 'error' in self.result:
                 self.result = []
             else:
             if 'error' in self.result:
                 self.result = []
             else:


@@ -102,7 +101,7 @@ class GenericResponse:
         elif value.startswith("^"):
             assert re.fullmatch(value, self.result[idx][field]), \
                    BadRowValueAssert(self, idx, field, value)
         elif value.startswith("^"):
             assert re.fullmatch(value, self.result[idx][field]), \
                    BadRowValueAssert(self, idx, field, value)

-        elif isinstance(self.result[idx][field], OrderedDict):
+        elif isinstance(self.result[idx][field], dict):

             assert self.result[idx][field] == eval('{' + value + '}'), \
                    BadRowValueAssert(self, idx, field, value)
         else:
             assert self.result[idx][field] == eval('{' + value + '}'), \
                    BadRowValueAssert(self, idx, field, value)
         else:


@@ -115,7 +114,7 @@ class GenericResponse:
 
         field = self.result[idx]
         for p in path:
 
         field = self.result[idx]
         for p in path:

-            assert isinstance(field, OrderedDict)
+            assert isinstance(field, dict)

             assert p in field
             field = field[p]
 
             assert p in field
             field = field[p]
 


@@ -123,7 +122,7 @@ class GenericResponse:
             assert Almost(value) == float(field)
         elif value.startswith("^"):
             assert re.fullmatch(value, field)
             assert Almost(value) == float(field)
         elif value.startswith("^"):
             assert re.fullmatch(value, field)

-        elif isinstance(field, OrderedDict):
+        elif isinstance(field, dict):

             assert field, eval('{' + value + '}')
         else:
             assert str(field) == str(value)
             assert field, eval('{' + value + '}')
         else:
             assert str(field) == str(value)