Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1080)

Unified Diff: telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py

Issue 2671693002: [Telemetry] Validate args in js_template rendering (Closed)
Patch Set: fix old api Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py
diff --git a/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py b/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py
index 66d4d57dbd8cf1b6dc56fb2978c3df6db4bf0260..7894287a719ae77c6bb2460c1f53647d06348446 100644
--- a/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py
+++ b/telemetry/telemetry/internal/backends/chrome_inspector/inspector_backend.py
@@ -210,8 +210,8 @@ class InspectorBackend(object):
exceptions.DevtoolsTargetCrashException
"""
# Use the default both when timeout=None or the option is ommited.
- timeout = kwargs.get('timeout') or 60
- context_id = kwargs.get('context_id')
+ timeout = kwargs.pop('timeout', None) or 60
+ context_id = kwargs.pop('context_id', None)
statement = js_template.Render(statement, **kwargs)
self._runtime.Execute(statement, context_id, timeout)
@@ -238,8 +238,8 @@ class InspectorBackend(object):
exceptions.DevtoolsTargetCrashException
"""
# Use the default both when timeout=None or the option is ommited.
- timeout = kwargs.get('timeout') or 60
- context_id = kwargs.get('context_id')
+ timeout = kwargs.pop('timeout', None) or 60
+ context_id = kwargs.pop('context_id', None)
expression = js_template.Render(expression, **kwargs)
return self._runtime.Evaluate(expression, context_id, timeout)
@@ -270,8 +270,8 @@ class InspectorBackend(object):
exceptions.DevtoolsTargetCrashException
"""
# Use the default both when timeout=None or the option is ommited.
- timeout = kwargs.get('timeout') or 60
- context_id = kwargs.get('context_id')
+ timeout = kwargs.pop('timeout', None) or 60
+ context_id = kwargs.pop('context_id', None)
condition = js_template.Render(condition, **kwargs)
def IsJavaScriptExpressionTrue():

Powered by Google App Engine
This is Rietveld 408576698