summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-09-27 21:07:39 +0100
committerMichael Williamson <mike@zwobble.org>2013-09-27 21:07:39 +0100
commitbeb5731d6b908b7d4907cf60bc4d71e7b8750f80 (patch)
tree60821328832acc80b6bdad40d4cc910953317139
parente7223237e3e913678bf16e7d670238133807d710 (diff)
Rename raw argument to raw_input
-rw-r--r--jq.pyx6
-rw-r--r--tests/jq_tests.py12
2 files changed, 9 insertions, 9 deletions
diff --git a/jq.pyx b/jq.pyx
index dc4ba6e..1802b49 100644
--- a/jq.pyx
+++ b/jq.pyx
@@ -51,9 +51,9 @@ cdef class _Program(object):
def __dealloc__(self):
jq_teardown(&self._jq)
- def transform(self, input, raw=False):
- raw_input = input if raw else json.dumps(input)
- result_strings = self._string_to_strings(raw_input)
+ def transform(self, input, raw_input=False):
+ string_input = input if raw_input else json.dumps(input)
+ result_strings = self._string_to_strings(string_input)
return _Result(result_strings)
diff --git a/tests/jq_tests.py b/tests/jq_tests.py
index 821cac1..243af14 100644
--- a/tests/jq_tests.py
+++ b/tests/jq_tests.py
@@ -7,7 +7,7 @@ from jq import jq
def dot_operator_does_nothing_to_string_input():
assert_equal(
"42",
- str(jq(".").transform("42", raw=True))
+ str(jq(".").transform("42", raw_input=True))
)
@@ -23,7 +23,7 @@ def dot_operator_does_nothing_to_json_input():
def can_add_one_to_each_element_of_an_array():
assert_equal(
"[2,3,4]",
- str(jq("[.[]+1]").transform("[1,2,3]", raw=True))
+ str(jq("[.[]+1]").transform([1, 2, 3]))
)
@@ -31,7 +31,7 @@ def can_add_one_to_each_element_of_an_array():
def output_elements_are_separated_by_newlines():
assert_equal(
"1\n2\n3",
- str(jq(".[]").transform("[1,2,3]", raw=True))
+ str(jq(".[]").transform([1, 2, 3]))
)
@@ -39,7 +39,7 @@ def output_elements_are_separated_by_newlines():
def string_to_json_parses_json_output():
assert_equal(
[2, 3, 4],
- jq("[.[]+1]").transform("[1,2,3]", raw=True).json()
+ jq("[.[]+1]").transform([1, 2, 3]).json()
)
@@ -47,7 +47,7 @@ def string_to_json_parses_json_output():
def string_to_json_parses_json_output():
assert_equal(
[2, 3, 4],
- jq(".[]+1").transform("[1,2,3]", raw=True).json_all()
+ jq(".[]+1").transform([1, 2, 3]).json_all()
)
@@ -55,7 +55,7 @@ def string_to_json_parses_json_output():
def output_elements_are_separated_by_newlines_when_there_are_multiple_inputs():
assert_equal(
"2\n3\n4",
- str(jq(".+1").transform("1\n2\n3", raw=True))
+ str(jq(".+1").transform("1\n2\n3", raw_input=True))
)