build/android/pylib/pexpect.py - Issue 11230057: Move pexpect try-except to pexpect wrapper file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/pexpect.py

Issue 11230057: Move pexpect try-except to pexpect wrapper file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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:

Index: build/android/pylib/pexpect.py

diff --git a/build/android/pylib/pexpect.py b/build/android/pylib/pexpect.py

index b0d980846fd8bef0ae2ecc86b3b83f7a2e831988..2875bb76f91116ecfe6219b7dde6eb68df97f51b 100644

--- a/build/android/pylib/pexpect.py

+++ b/build/android/pylib/pexpect.py

@@ -13,4 +13,9 @@ _PEXPECT_PATH = os.path.join(_CHROME_SRC, 'third_party', 'pexpect')

if _PEXPECT_PATH not in sys.path:

sys.path.append(_PEXPECT_PATH)

-from pexpect import *

+# pexpect is not available on all platforms. We allow this file to be imported

+# on platforms without pexpect and only fail when pexpect is actually used.

+try:

+ from pexpect import *

+except:

+ pexpect = None

bulach 2012/10/23 15:28:25 nit: I guess "pass" would be better..

tonyg 2012/10/23 15:31:41 Done.

« no previous file with comments | « build/android/pylib/android_commands.py ('k') | no next file » | no next file with comments »