Skip to content

Commit 6716ee8

Browse files
committed
update typing for execute_json() and some documentation changes related to 0.5.4 update
1 parent a2bc2d8 commit 6716ee8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

exiftool/exiftool.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ def execute(self, *params: Union[str, bytes], raw_bytes: bool = False) -> Union[
915915
.. note::
916916
The parameters to this function must be type ``str`` or ``bytes``.
917917
918-
:type params: one or more string parameters
918+
:type params: one or more string/bytes parameters
919919
920920
:param raw_bytes: If True, returns bytes. Default behavior returns a str
921921
@@ -1067,7 +1067,7 @@ def execute(self, *params: Union[str, bytes], raw_bytes: bool = False) -> Union[
10671067

10681068

10691069
# ----------------------------------------------------------------------------------------------------------------------
1070-
def execute_json(self, *params: str) -> List:
1070+
def execute_json(self, *params: Union[str, bytes]) -> List:
10711071
"""Execute the given batch of parameters and parse the JSON output.
10721072
10731073
This method is similar to :py:meth:`execute()`. It
@@ -1097,9 +1097,9 @@ def execute_json(self, *params: str) -> List:
10971097
Typically passed in via `Unpacking Argument Lists`_
10981098
10991099
.. note::
1100-
The parameters to this function must be type ``str``
1100+
The parameters to this function must be type ``str`` or ``bytes``.
11011101
1102-
:type params: one or more string parameters
1102+
:type params: one or more string/bytes parameters
11031103
11041104
:return: Valid JSON parsed into a Python list of dicts
11051105
:raises ExifToolOutputEmptyError: If *exiftool* did not return any STDOUT

0 commit comments

Comments
 (0)