Skip to content

Exorcise a Python eval and transmute into the lesser demon getattr #2951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LaRiffle merged 3 commits into from
Jan 27, 2020
Merged

Exorcise a Python eval and transmute into the lesser demon getattr #2951

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e99bfe2
Exorcise a Python `eval` and transmute into the lesser demon `getattr`
karlhigley Jan 22, 2020
dc587f4
Remove the double split for optimization
karlhigley Jan 23, 2020
07f19c4
Merge branch 'master' into fix/unnecessary-eval
karlhigley Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions syft/frameworks/torch/tensors/interpreters/native.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,6 @@ def handle_func_command(cls, command):
except AttributeError:
pass

# TODO: clean this line
cmd = (
"syft.local_worker.hook."
+ ".".join(cmd.split(".")[:-1])
+ ".native_"
+ cmd.split(".")[-1]
)
# Run the native function with the new args
# Note the the cmd should already be checked upon reception by the worker
# in the execute_command function
Expand All @@ -341,10 +334,19 @@ def _get_response(cmd, args, kwargs):
"""
Return the evaluation of the cmd string parameter
"""
module = syft.local_worker.hook
segments = cmd.split(".")
submodules = segments[:-1]
command = segments[-1]

for sm in submodules:
module = getattr(module, sm)

command_method = getattr(module, f"native_{command}")
if isinstance(args, tuple):
response = eval(cmd)(*args, **kwargs)
response = command_method(*args, **kwargs)
else:
response = eval(cmd)(args, **kwargs)
response = command_method(args, **kwargs)

return response

Expand Down