diff options
| author | jbudorick <jbudorick@chromium.org> | 2014-11-19 07:41:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 15:41:56 +0000 |
| commit | 0f77e966d5fa7d854772e63a64d0ab518c2bd3e8 (patch) | |
| tree | baba1444a67ceebf0ebf1a37b9b207aca403f879 /build/android/adb_logcat_monitor.py | |
| parent | 42d412347438334a96501afc5dfe058fcfef83cd (diff) | |
| download | chromium_src-0f77e966d5fa7d854772e63a64d0ab518c2bd3e8.zip chromium_src-0f77e966d5fa7d854772e63a64d0ab518c2bd3e8.tar.gz chromium_src-0f77e966d5fa7d854772e63a64d0ab518c2bd3e8.tar.bz2 | |
[Android] Fix new pylint errors in build/android/.
BUG=434544
Review URL: https://codereview.chromium.org/727543003
Cr-Commit-Position: refs/heads/master@{#304812}
Diffstat (limited to 'build/android/adb_logcat_monitor.py')
| -rwxr-xr-x | build/android/adb_logcat_monitor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/android/adb_logcat_monitor.py b/build/android/adb_logcat_monitor.py index a5ae785..d3cc67d 100755 --- a/build/android/adb_logcat_monitor.py +++ b/build/android/adb_logcat_monitor.py @@ -83,7 +83,7 @@ def GetAttachedDevices(adb_cmd): stderr=subprocess.PIPE).communicate() if err: logging.warning('adb device error %s', err.strip()) - return re.findall('^(\S+)\tdevice$', out, re.MULTILINE) + return re.findall('^(\\S+)\tdevice$', out, re.MULTILINE) except TimeoutException: logging.warning('"adb devices" command timed out') return [] @@ -136,7 +136,7 @@ def main(base_dir, adb_cmd='adb'): time.sleep(5) except SigtermError: logging.info('Received SIGTERM, shutting down') - except: + except: # pylint: disable=bare-except logging.exception('Unexpected exception in main.') finally: for process, _ in devices.itervalues(): |