diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 17:38:56 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 17:38:56 +0000 |
| commit | ae0fe9a1d21f7c4c2a22dddf43fa331de15a3cac (patch) | |
| tree | f1bd9fdf9ca003676b5614839b70d4061aeeea0d /tools/telemetry | |
| parent | e36826d9cf856d87df54fab196ae05f05446f583 (diff) | |
| download | chromium_src-ae0fe9a1d21f7c4c2a22dddf43fa331de15a3cac.zip chromium_src-ae0fe9a1d21f7c4c2a22dddf43fa331de15a3cac.tar.gz chromium_src-ae0fe9a1d21f7c4c2a22dddf43fa331de15a3cac.tar.bz2 | |
[Telemetry] Win build fix: try-except pexpect import
This fixes an import error on windows.
BUG=None
TEST=moz page cycler on windows
NOTRY=True
TBR=marja@chromium.org
Review URL: https://codereview.chromium.org/15162008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
| -rw-r--r-- | tools/telemetry/telemetry/core/platform/profiler/iprofiler_profiler.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/core/platform/profiler/iprofiler_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/iprofiler_profiler.py index 66ea97e..8c76c4d 100644 --- a/tools/telemetry/telemetry/core/platform/profiler/iprofiler_profiler.py +++ b/tools/telemetry/telemetry/core/platform/profiler/iprofiler_profiler.py @@ -13,7 +13,10 @@ from telemetry.core.platform import profiler sys.path.append(os.path.join( os.path.abspath(os.path.dirname(__file__)), '..', '..', '..', '..', '..', '..', 'third_party', 'pexpect')) -import pexpect # pylint: disable=F0401 +try: + import pexpect # pylint: disable=F0401 +except ImportError: + pass class IprofilerProfiler(profiler.Profiler): |