Replaced jsonpath_rw in favor of jsonpath_ng

Signed-off-by: Mike Raineri <michael.raineri@dell.com>

Author: mraineri

README.rst

@@ -46,7 +46,7 @@ Required external packages:
 
     jsonpatch<=1.24 ; python_version == '3.4'
     jsonpatch ; python_version >= '3.5'
-    jsonpath_rw
+    jsonpath_ng
     jsonpointer
     requests
     requests-toolbelt

requirements.txt

@@ -1,6 +1,6 @@
 jsonpatch<=1.24 ; python_version == '3.4'
 jsonpatch ; python_version >= '3.5'
-jsonpath_rw
+jsonpath_ng
 jsonpointer
 requests
 requests-toolbelt

setup.py

@@ -29,7 +29,7 @@
       packages=find_packages('src'),
       package_dir={'': 'src'},
       install_requires=[
-          'jsonpath_rw',
+          'jsonpath_ng',
           'jsonpointer',
           "requests",
           'requests_toolbelt',

src/redfish/ris/ris.py

@@ -15,7 +15,7 @@
 from queue import Queue
 from collections import OrderedDict
 
-import jsonpath_rw
+import jsonpath_ng
 
 import redfish.rest.v1
 from redfish.ris.sharedtypes import Dictable
@@ -406,7 +406,7 @@ def _load(
 
         if loadtype == "href":
             # follow all the href attributes
-            jsonpath_expr = jsonpath_rw.parse("$..'@odata.id'")
+            jsonpath_expr = jsonpath_ng.parse("$..'@odata.id'")
             matches = jsonpath_expr.find(resp.dict)
 
             if "links" in resp.dict and "NextPage" in resp.dict["links"]:

src/redfish/ris/rmc.py

@@ -19,7 +19,7 @@
 from collections.abc import Mapping
 
 import jsonpatch
-import jsonpath_rw
+import jsonpath_ng
 import jsonpointer
 
 from redfish.ris.rmc_helper import (UndefinedClientError, \
@@ -384,7 +384,7 @@ def get(self, selector=None):
                 currdict = jsonpatch.apply_patch(currdict, patch)
 
             if selector:
-                jsonpath_expr = jsonpath_rw.parse('%s' % selector)
+                jsonpath_expr = jsonpath_ng.parse('%s' % selector)
                 matches = jsonpath_expr.find(currdict)
                 temp_dict = OrderedDict()
 
@@ -440,7 +440,7 @@ def get_save(self, selector=None, currentoverride=False, pluspath=False,
                         break
 
                 try:
-                    jsonpath_expr = jsonpath_rw.parse('"%s"' % selector)
+                    jsonpath_expr = jsonpath_ng.parse('"%s"' % selector)
                 except Exception as excp:
                     raise InvalidCommandLineError(excp)
 
@@ -516,7 +516,7 @@ def set(self, selector=None, val=None):
                         break
 
                 newdict = currdict.copy()
-                jsonpath_expr = jsonpath_rw.parse(u'%s' % selector)
+                jsonpath_expr = jsonpath_ng.parse(u'%s' % selector)
                 matches = jsonpath_expr.find(currdict)
 
                 if not matches:
@@ -730,7 +730,7 @@ def loadset(self, dicttolist=None, selector=None, val=None, newargs=None):
                 dicttolist = []
 
             for (itersel, iterval) in dicttolist:
-                jsonpath_expr = jsonpath_rw.parse('%s' % itersel)
+                jsonpath_expr = jsonpath_ng.parse('%s' % itersel)
                 matches = jsonpath_expr.find(currdict)
 
                 if not matches: