Chromium Code Reviews Chromium Code Reviews
Issue 11230057:
Move pexpect try-except to pexpect wrapper file. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 from __future__ import absolute_import | 4 from __future__ import absolute_import |
| 5 | 5 |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 _CHROME_SRC = os.path.join( | 9 _CHROME_SRC = os.path.join( |
| 10 os.path.abspath(os.path.dirname(__file__)), '..', '..', '..') | 10 os.path.abspath(os.path.dirname(__file__)), '..', '..', '..') |
| 11 | 11 |
| 12 _PEXPECT_PATH = os.path.join(_CHROME_SRC, 'third_party', 'pexpect') | 12 _PEXPECT_PATH = os.path.join(_CHROME_SRC, 'third_party', 'pexpect') |
| 13 if _PEXPECT_PATH not in sys.path: | 13 if _PEXPECT_PATH not in sys.path: |
| 14 sys.path.append(_PEXPECT_PATH) | 14 sys.path.append(_PEXPECT_PATH) |
| 15 | 15 |
| 16 from pexpect import * | 16 # pexpect is not available on all platforms. We allow this file to be imported |
| 17 # on platforms without pexpect and only fail when pexpect is actually used. | |
| 18 try: | |
| 19 from pexpect import * | |
| 20 except: | |
| 21 pexpect = None | |
|
bulach
2012/10/23 15:28:25
nit: I guess "pass" would be better..
tonyg
2012/10/23 15:31:41
Done.
| |
| OLD | NEW |
