refactor(name): use proper import names

Author: tomas-fp

jsonpath_ng/bin/jsonpath.py

@@ -15,7 +15,7 @@
 import argparse
 
 # JsonPath-RW imports
-from jsonpath_rw import parse
+from jsonpath_ng import parse
 
 def find_matches_for_file(expr, f):
     return expr.find(json.load(f))

jsonpath_ng/parser.py

@@ -5,8 +5,8 @@
 
 import ply.yacc
 
-from jsonpath_rw.jsonpath import *
-from jsonpath_rw.lexer import JsonPathLexer
+from jsonpath_ng.jsonpath import *
+from jsonpath_ng.lexer import JsonPathLexer
 
 logger = logging.getLogger(__name__)
 
@@ -17,7 +17,7 @@ class JsonPathParser(object):
     '''
     An LALR-parser for JsonPath
     '''
-    
+
     tokens = JsonPathLexer.tokens
 
     def __init__(self, debug=False, lexer_class=None):
@@ -40,7 +40,7 @@ def parse_token_stream(self, token_iterator, start_symbol='jsonpath'):
             module_name = os.path.splitext(os.path.split(__file__)[1])[0]
         except:
             module_name = __name__
-        
+
         parsing_table_module = '_'.join([module_name, start_symbol, 'parsetab'])
 
         # And we regenerate the parse table every time; it doesn't actually take that long!
@@ -55,7 +55,7 @@ def parse_token_stream(self, token_iterator, start_symbol='jsonpath'):
         return new_parser.parse(lexer = IteratorToTokenStream(token_iterator))
 
     # ===================== PLY Parser specification =====================
-    
+
     precedence = [
         ('left', ','),
         ('left', 'DOUBLEDOT'),
@@ -66,10 +66,10 @@ def parse_token_stream(self, token_iterator, start_symbol='jsonpath'):
     ]
 
     def p_error(self, t):
-        raise Exception('Parse error at %s:%s near token %s (%s)' % (t.lineno, t.col, t.value, t.type)) 
+        raise Exception('Parse error at %s:%s near token %s (%s)' % (t.lineno, t.col, t.value, t.type))
 
     def p_jsonpath_binop(self, p):
-        """jsonpath : jsonpath '.' jsonpath 
+        """jsonpath : jsonpath '.' jsonpath
                     | jsonpath DOUBLEDOT jsonpath
                     | jsonpath WHERE jsonpath
                     | jsonpath '|' jsonpath
@@ -134,7 +134,7 @@ def p_jsonpath_parens(self, p):
 
     # Because fields in brackets cannot be '*' - that is reserved for array indices
     def p_fields_or_any(self, p):
-        """fields_or_any : fields 
+        """fields_or_any : fields
                          | '*'    """
         if p[1] == '*':
             p[0] = ['*']
@@ -165,7 +165,7 @@ def p_maybe_int(self, p):
         """maybe_int : NUMBER
                      | empty"""
         p[0] = p[1]
-    
+
     def p_empty(self, p):
         'empty :'
         p[0] = None

tests/bin/test_jsonpath.py

@@ -9,7 +9,7 @@
 import os
 import json
 
-from jsonpath_rw.bin.jsonpath import main
+from jsonpath_ng.bin.jsonpath import main
 
 class TestJsonPathScript(unittest.TestCase):
     """

tests/test_jsonpath.py

@@ -1,11 +1,11 @@
 from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import unittest
 
-from jsonpath_rw import jsonpath # For setting the global auto_id_field flag
+from jsonpath_ng import jsonpath # For setting the global auto_id_field flag
 
-from jsonpath_rw.parser import parse
-from jsonpath_rw.jsonpath import *
-from jsonpath_rw.lexer import JsonPathLexerError
+from jsonpath_ng.parser import parse
+from jsonpath_ng.jsonpath import *
+from jsonpath_ng.lexer import JsonPathLexerError
 
 class TestDatumInContext(unittest.TestCase):
     """

tests/test_jsonpath_rw_ext.py

@@ -13,21 +13,21 @@
 # under the License.
 
 """
-test_jsonpath_rw_ext
+test_jsonpath_ng_ext
 ----------------------------------
 
-Tests for `jsonpath_rw_ext` module.
+Tests for `jsonpath_ng_ext` module.
 """
 
-from jsonpath_rw import jsonpath  # For setting the global auto_id_field flag
+from jsonpath_ng import jsonpath  # For setting the global auto_id_field flag
 from oslotest import base
 from six import moves
 import testscenarios
 
-from jsonpath_rw_ext import parser
+from jsonpath_ng_ext import parser
 
 
-class TestJsonpath_rw_ext(testscenarios.WithScenarios,
+class Testjsonpath_ng_ext(testscenarios.WithScenarios,
                           base.BaseTestCase):
     scenarios = [
         ('sorted_list', dict(string='objects.`sorted`',
@@ -343,7 +343,7 @@ def test_fields_value(self):
             self.assertEqual(self.target, result[0].value)
 
 # NOTE(sileht): copy of tests/test_jsonpath.py
-# to ensure we didn't break jsonpath_rw
+# to ensure we didn't break jsonpath_ng
 
 
 class TestJsonPath(base.BaseTestCase):

tests/test_lexer.py

@@ -4,7 +4,7 @@
 
 from ply.lex import LexToken
 
-from jsonpath_rw.lexer import JsonPathLexer, JsonPathLexerError
+from jsonpath_ng.lexer import JsonPathLexer, JsonPathLexerError
 
 class TestLexer(unittest.TestCase):
 

tests/test_parser.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
 import unittest
 
-from jsonpath_rw.lexer import JsonPathLexer
-from jsonpath_rw.parser import JsonPathParser
-from jsonpath_rw.jsonpath import *
+from jsonpath_ng.lexer import JsonPathLexer
+from jsonpath_ng.parser import JsonPathParser
+from jsonpath_ng.jsonpath import *
 
 class TestParser(unittest.TestCase):
     # TODO: This will be much more effective with a few regression tests and `arbitrary` parse . pretty testing