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

Unified Diff: tools/telemetry/telemetry/core/chrome/inspector_runtime.py

Issue 12278015: [Telemetry] Reorganize everything. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add shebangs. Created 7 years, 10 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: tools/telemetry/telemetry/core/chrome/inspector_runtime.py
diff --git a/tools/telemetry/telemetry/inspector_runtime.py b/tools/telemetry/telemetry/core/chrome/inspector_runtime.py
similarity index 89%
rename from tools/telemetry/telemetry/inspector_runtime.py
rename to tools/telemetry/telemetry/core/chrome/inspector_runtime.py
index 4479b66b1d221c99deb26004b9d638e16bb0efd2..e72ab5ff230796c66fbb409ba97fa1b8a8fabd57 100644
--- a/tools/telemetry/telemetry/inspector_runtime.py
+++ b/tools/telemetry/telemetry/core/chrome/inspector_runtime.py
@@ -1,8 +1,7 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-class EvaluateException(Exception):
- pass
+from telemetry.core import exceptions
class InspectorRuntime(object):
def __init__(self, inspector_backend):
@@ -46,12 +45,12 @@ class InspectorRuntime(object):
}
res = self._inspector_backend.SyncRequest(request, timeout)
if 'error' in res:
- raise EvaluateException(res['error']['message'])
+ raise exceptions.EvaluateException(res['error']['message'])
if 'wasThrown' in res['result'] and res['result']['wasThrown']:
# TODO(nduca): propagate stacks from javascript up to the python
# exception.
- raise EvaluateException(res['result']['result']['description'])
+ raise exceptions.EvaluateException(res['result']['result']['description'])
if res['result']['result']['type'] == 'undefined':
return None
return res['result']['result']['value']

Powered by Google App Engine
This is Rietveld 408576698