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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: appengine/third_party/python-adb/PATCH.swarming

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:

View unified diff | Download patch

OLD	NEW
1 --- a/adb/adb_commands.py	1 --- a/adb/adb_commands.py

2 +++ b/adb/adb_commands.py	2 +++ b/adb/adb_commands.py

3 @@ -26,8 +26,6 @@ import cStringIO	3 @@ -26,8 +26,6 @@ import cStringIO

4 import os	4 import os

5 import socket	5 import socket

6	6

7 -from M2Crypto import RSA	7 -from M2Crypto import RSA

8 -	8 -

9 import adb_protocol	9 import adb_protocol

10 import common	10 import common

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 +++ b/adb/adb_protocol.py	67 +++ b/adb/adb_protocol.py

68 @@ -295,7 +295,7 @@ class AdbMessage(object):	68 @@ -295,7 +295,7 @@ class AdbMessage(object):

69 try:	69 try:

70 cmd, arg0, unused_arg1, banner = cls.Read(	70 cmd, arg0, unused_arg1, banner = cls.Read(

71 usb, ['CNXN'], timeout_ms=auth_timeout_ms)	71 usb, ['CNXN'], timeout_ms=auth_timeout_ms)

72 - except usb_exceptions.BulkReadFailedError as e:	72 - except usb_exceptions.BulkReadFailedError as e:

73 + except usb_exceptions.ReadFailedError as e:	73 + except usb_exceptions.ReadFailedError as e:

74 if e.usb_error.value == -7: # Timeout.	74 if e.usb_error.value == -7: # Timeout.

75 raise usb_exceptions.DeviceAuthError(	75 raise usb_exceptions.DeviceAuthError(

76 'Accept auth key on device, then retry.')	76 'Accept auth key on device, then retry.')

	77 --- a/adb/common.py

	78 +++ b/adb/common.py

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

	80 import threading

	81 import weakref

	82

	83 -import libusb1

	84 -import usb1

	85 +from python_libusb1 import libusb1

	86 +from python_libusb1 import usb1

	87

	88 import usb_exceptions

	89

	90 --- a/adb/filesync_protocol.py

	91 +++ b/adb/filesync_protocol.py

	92 @@ -22,7 +22,7 @@ import stat

	93 import struct

	94 import time

	95

	96 -import libusb1

	97 +from python_libusb1 import libusb1

	98

	99 import adb_protocol

	100 import usb_exceptions

OLD	NEW

« no previous file with comments | « appengine/swarming/tools/android/README.md ('k') | appengine/third_party/python-adb/README.swarming » ('j') | no next file with comments »