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

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

Issue 11234043: In android_commands.py, surround pexpect import in try-except. (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index 8a1562caad5e298bff78291404890ead877ecd40..4eae1b729e535abddfa702b8ad63e00189cfb61f 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -19,7 +19,12 @@ import tempfile
import time
import io_stats_parser
-from pylib import pexpect
+# 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.
bulach 2012/10/23 10:41:25 nit: nduca added our own wrapper in build/android/
+try:
+ from pylib import pexpect
+except:
+ pexpect = None
CHROME_SRC = os.path.join(
os.path.abspath(os.path.dirname(__file__)), '..', '..', '..')
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698