Python3: resources and libraries

Change-Id: I1392c06b1d64f62b141d24c0d42a8e36913b15e2
Signed-off-by: Jan Gelety <jgelety@cisco.com>

1 files changed, 5 insertions, 21 deletions

diff --git a/resources/libraries/python/parsers/JsonParser.py b/resources/libraries/python/parsers/JsonParser.py
index 2c8e62ffe3..c597d5a935 100644
--- a/resources/libraries/python/parsers/JsonParser.py
+++ b/resources/libraries/python/parsers/JsonParser.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -14,10 +14,11 @@
 """Used to parse JSON files or JSON data strings to dictionaries"""
 
 import json
-from os import uname
 
+from io import open
 
-class JsonParser(object):
+
+class JsonParser:
     """Parses JSON data string or files containing JSON data strings"""
     def __init__(self):
         pass
@@ -33,23 +34,6 @@ class JsonParser(object):
         :returns: JSON data parsed as python list.
         :rtype: list
         """
-        if "4.2.0-42-generic" in uname():
-            # TODO: remove ugly workaround
-            # On Ubuntu14.04 the VAT console returns "error:misc" even after
-            # some commands execute correctly. This causes problems
-            # with parsing JSON data.
-            known_errors = ["sw_interface_dump error: Misc",
-                            "lisp_eid_table_dump error: Misc",
-                            "show_lisp_status error: Misc",
-                            "lisp_map_resolver_dump error: Misc",
-                            "show_lisp_pitr error: Misc",
-                            "snat_static_mapping_dump error: Misc",
-                           ]
-            for item in known_errors:
-                if item in json_data:
-                    json_data = json_data.replace(item, "")
-                    print("Removing API error: *{0}* "
-                          "from JSON output.".format(item))
         parsed_data = json.loads(json_data)
         return parsed_data
 
@@ -65,6 +49,6 @@ class JsonParser(object):
         :returns: JSON data parsed as python list.
         :rtype: list
         """
-        input_data = open(json_file).read()
+        input_data = open(json_file, "rt").read()
         parsed_data = JsonParser.parse_data(input_data)
         return parsed_data