fixed ordering, adjusted tests

Author: Cyber1000

pyairctrl/airctrl.py

@@ -128,11 +128,11 @@ def set_wifi(self, ssid, pwd):
 
     def get_wifi(self):
         wifi = self._client.get_wifi()
-        pprint.pprint(wifi)
+        self._dump_keys(wifi, None, False)
 
     def get_firmware(self):
         firmware = self._client.get_firmware()
-        pprint.pprint(firmware)
+        self._dump_keys(firmware, None, False)
 
 
 def main():

pyairctrl/http_client.py

@@ -193,17 +193,17 @@ def _get_once(self, url):
         with urllib.request.urlopen(url) as response:
             resp = response.read()
             resp = decrypt(resp.decode("ascii"), self._session_key)
-            return json.loads(resp)
+            return json.loads(resp, object_pairs_hook=OrderedDict)
 
     def _get(self, url):
         try:
-            return json.loads(self._get_once(url), object_pairs_hook=OrderedDict)
+            return self._get_once(url)
         except Exception as e:
             if self._debug:
                 print("GET error: {}".format(str(e)))
                 print("Will retry after getting a new key ...")
             self._get_key()
-            return json.loads(self._get_once(url), object_pairs_hook=OrderedDict)
+            return self._get_once(url)
 
     def get_status(self, debug=False):
         url = "http://{}/di/v1/products/1/air".format(self._host)

testing/data.json

@@ -33,7 +33,7 @@
             "execute": [
                 "airctrl --protocol http --wifi"
             ],
-            "data": "{'cppid': '0000000000000000',\n 'dhcp': True,\n 'gateway': '127.0.0.1',\n 'ipaddress': '127.0.0.2',\n 'macaddress': '00:00:00:00:00:00',\n 'netmask': '255.255.255.0',\n 'password': 'xxx',\n 'protection': 'wpa-2',\n 'ssid': 'My SSID'}\n"
+            "data": "cppid: 0000000000000000\ndhcp: True\ngateway: 127.0.0.1\nipaddress: 127.0.0.2\nmacaddress: 00:00:00:00:00:00\nnetmask: 255.255.255.0\npassword: xxx\nprotection: wpa-2\nssid: My SSID\n"
         },
         "firmware": {
             "device": "AC2729/10",
@@ -49,7 +49,7 @@
             "execute": [
                 "airctrl --protocol http --firmware"
             ],
-            "data": "{'mandatory': False,\n 'name': 'AC2729_10',\n 'progress': 0,\n 'state': 'idle',\n 'statusmsg': '',\n 'upgrade': '',\n 'version': '8'}\n"
+            "data": "mandatory: False\nName: AC2729_10\nprogress: 0\nstate: idle\nstatusmsg: \nupgrade: \nversion: 8\n"
         },
         "fltsts": {
             "device": "AC2729/10",