build/android/devil/utils/reset_usb.py - Issue 1314913009: [Android] Move some pylib modules into devil/

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/devil/utils/reset_usb.py

Issue 1314913009: [Android] Move some pylib modules into devil/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 4 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/devil/utils/reset_usb.py

diff --git a/build/android/devil/utils/reset_usb.py b/build/android/devil/utils/reset_usb.py

index 95a6b15b397769227eb520701645d695445e089a..4b2ae2d5d25a6392ace9106d5982065b4339959b 100755

--- a/build/android/devil/utils/reset_usb.py

+++ b/build/android/devil/utils/reset_usb.py

@@ -9,10 +9,10 @@ import logging

import re

import sys

-from pylib import cmd_helper

-from pylib.device import adb_wrapper

-from pylib.device import device_errors

-from pylib.utils import run_tests_helper

+from devil.android import device_errors

+from devil.android.sdk import adb_wrapper

+from devil.utils import cmd_helper

+from devil.utils import run_tests_helper

_INDENTATION_RE = re.compile(r'^( *)')

_LSUSB_BUS_DEVICE_RE = re.compile(r'^Bus (\d{3}) Device (\d{3}):')