android: Fix importing pexpect on Mac
We should use the version of pexpect from pylib to make sure we can import it an all platforms where it is available. BUG=304337 R=torne@chromium.org Review URL: https://codereview.chromium.org/26212003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@227946 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
697383b493
Коммит
6174ec41c1
|
@ -8,13 +8,13 @@ import gzip
|
|||
import logging
|
||||
import optparse
|
||||
import os
|
||||
import pexpect
|
||||
import re
|
||||
import sys
|
||||
import time
|
||||
|
||||
from pylib import android_commands
|
||||
from pylib import constants
|
||||
from pylib import pexpect
|
||||
|
||||
|
||||
def _GetSupportedBrowsers():
|
||||
|
|
|
@ -22,7 +22,7 @@ import cmd_helper
|
|||
import constants
|
||||
import io_stats_parser
|
||||
try:
|
||||
import pexpect
|
||||
from pylib import pexpect
|
||||
except:
|
||||
pexpect = None
|
||||
|
||||
|
|
|
@ -45,12 +45,12 @@ options:
|
|||
|
||||
import datetime
|
||||
import logging
|
||||
import pexpect
|
||||
import pickle
|
||||
import os
|
||||
import sys
|
||||
|
||||
from pylib import constants
|
||||
from pylib import pexpect
|
||||
from pylib.base import base_test_result
|
||||
from pylib.base import base_test_runner
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче