diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..ef9e347 --- /dev/null +++ b/NOTICE @@ -0,0 +1,14 @@ +Files modified by dlacher to support predicate logic (https://github.com/h2non/jsonpath-ng/pull/21): +- jsonpath_ng/ext/filter.py +- jsonpath_ng/ext/iterable.py +- jsonpath_ng/ext/parser.py +- tests/test_jsonpath_rw_ext.py + +Files modified by elrandira to support commas for index accesses and steps in slices +(https://github.com/h2non/jsonpath-ng/pull/102): +- jsonpath_ng/jsonpath.py +- jsonpath_ng/parser.py +- tests/test_create.py +- tests/test_examples.py +- tests/test_jsonpath.py +- tests/test_parser.py diff --git a/jsonpath_ng/ext/filter.py b/jsonpath_ng/ext/filter.py index 215b2ff..8ffb200 100644 --- a/jsonpath_ng/ext/filter.py +++ b/jsonpath_ng/ext/filter.py @@ -10,6 +10,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# NOTICE: +# modified by dlacher to support predicate logic: https://github.com/h2non/jsonpath-ng/pull/21 +# import operator import re diff --git a/jsonpath_ng/ext/iterable.py b/jsonpath_ng/ext/iterable.py index e5ddbfc..ab5a5f7 100644 --- a/jsonpath_ng/ext/iterable.py +++ b/jsonpath_ng/ext/iterable.py @@ -10,6 +10,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# NOTICE: +# modified by dlacher to support predicate logic: https://github.com/h2non/jsonpath-ng/pull/21 +# import functools from .. import This, DatumInContext, JSONPath diff --git a/jsonpath_ng/ext/parser.py b/jsonpath_ng/ext/parser.py index 5042a74..3d04b5f 100644 --- a/jsonpath_ng/ext/parser.py +++ b/jsonpath_ng/ext/parser.py @@ -10,6 +10,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# NOTICE: +# modified by dlacher to support predicate logic: https://github.com/h2non/jsonpath-ng/pull/21 from .. import lexer from .. import parser diff --git a/jsonpath_ng/jsonpath.py b/jsonpath_ng/jsonpath.py index 1617330..8411613 100644 --- a/jsonpath_ng/jsonpath.py +++ b/jsonpath_ng/jsonpath.py @@ -1,3 +1,20 @@ +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# NOTICE: +# modified by elrandira to support commas for index accesses and steps in slices +# https://github.com/h2non/jsonpath-ng/pull/102 + from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes import logging import six diff --git a/jsonpath_ng/parser.py b/jsonpath_ng/parser.py index 7e9693a..497bf32 100644 --- a/jsonpath_ng/parser.py +++ b/jsonpath_ng/parser.py @@ -1,3 +1,20 @@ +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# NOTICE: +# modified by elrandira to support commas for index accesses and steps in slices +# https://github.com/h2non/jsonpath-ng/pull/102 + from __future__ import ( print_function, absolute_import, diff --git a/tests/test_create.py b/tests/test_create.py index cb91289..3a39391 100644 --- a/tests/test_create.py +++ b/tests/test_create.py @@ -1,3 +1,20 @@ +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# NOTICE: +# modified by elrandira to support commas for index accesses and steps in slices +# https://github.com/h2non/jsonpath-ng/pull/102 + import doctest from collections import namedtuple diff --git a/tests/test_examples.py b/tests/test_examples.py index b9e3ad6..31a44cf 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -1,3 +1,20 @@ +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# NOTICE: +# modified by elrandira to support commas for index accesses +# https://github.com/h2non/jsonpath-ng/pull/102 + import pytest from jsonpath_ng.ext.filter import Filter, Expression diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py index 07c6d9b..7aeeb09 100644 --- a/tests/test_jsonpath.py +++ b/tests/test_jsonpath.py @@ -1,3 +1,20 @@ +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# NOTICE: +# modified by elrandira to support commas for index accesses and steps in slices +# https://github.com/h2non/jsonpath-ng/pull/102 + from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes import unittest diff --git a/tests/test_jsonpath_rw_ext.py b/tests/test_jsonpath_rw_ext.py index 814b9d6..7ac9034 100644 --- a/tests/test_jsonpath_rw_ext.py +++ b/tests/test_jsonpath_rw_ext.py @@ -11,6 +11,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# NOTICE: +# modified by dlacher to support predicate logic: https://github.com/h2non/jsonpath-ng/pull/21 """ test_jsonpath_ng_ext diff --git a/tests/test_parser.py b/tests/test_parser.py index 820bb16..31f4a30 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -1,3 +1,20 @@ +# +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# NOTICE: +# modified by elrandira to support commas for index accesses +# https://github.com/h2non/jsonpath-ng/pull/102 + from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes import unittest