appengine/third_party/python-adb/adb/common.py - Issue 1306633002: Overhaul Android support and make Swarming bot use python-adb

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: appengine/third_party/python-adb/adb/common.py

Issue 1306633002: Overhaul Android support and make Swarming bot use python-adb (Closed) Base URL: git@github.com:luci/luci-py.git@master

Patch Set: Packaged libusb1 as a relative package to fix import paths 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: appengine/third_party/python-adb/adb/common.py

diff --git a/appengine/third_party/python-adb/adb/common.py b/appengine/third_party/python-adb/adb/common.py

index 2dbb0e71ee8d33d8388509e0d9dcb9ec67b44892..b28df7f104221b8473ae0458d10d7485d72aabcd 100644

--- a/appengine/third_party/python-adb/adb/common.py

+++ b/appengine/third_party/python-adb/adb/common.py

@@ -20,8 +20,8 @@ import socket

import threading

import weakref

-import libusb1

-import usb1

+from python_libusb1 import libusb1

+from python_libusb1 import usb1

import usb_exceptions