build/android/pylib/android_commands.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/android_commands.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/android_commands.py

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

index 4eae1b729e535abddfa702b8ad63e00189cfb61f..8a1562caad5e298bff78291404890ead877ecd40 100644

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

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

@@ -19,12 +19,7 @@ import tempfile

import time

import io_stats_parser

-# 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 pylib import pexpect

-except:

- pexpect = None

+from pylib import pexpect

CHROME_SRC = os.path.join(

os.path.abspath(os.path.dirname(__file__)), '..', '..', '..')

« no previous file with comments | « no previous file | build/android/pylib/pexpect.py » ('j') | build/android/pylib/pexpect.py » ('J')