Restore Python2/3 compatibility of Push+Pull methods

google · Dec 8, 2018 · 2ead78a · 2ead78a
1 parent 02d88c9
commit 2ead78a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/adb/adb_commands.py b/adb/adb_commands.py
@@ -297,7 +297,7 @@ def Pull(self, device_filename, dest_file=None, timeout_ms=None, progress_callba
             dest_file = io.BytesIO()
         elif isinstance(dest_file, str):
             dest_file = open(dest_file, 'wb')
-        elif isinstance(dest_file, io.IOBase):
+        elif hasattr(dest_file, 'write'):
             pass
         else:
             raise ValueError("destfile is of unknown type")

diff --git a/adb/filesync_protocol.py b/adb/filesync_protocol.py
@@ -18,7 +18,6 @@
 """
 
 import collections
-import io
 import os
 import stat
 import struct
@@ -140,7 +139,7 @@ def Push(cls, connection, datafile, filename,
         cnxn.Send(b'SEND', fileinfo)
 
         if progress_callback:
-            total_bytes = os.fstat(datafile.fileno()).st_size if isinstance(datafile, io.IOBase) else -1
+            total_bytes = os.fstat(datafile.fileno()).st_size if hasattr(datafile, 'fileno') else -1
             progress = cls._HandleProgress(lambda current: progress_callback(filename, current, total_bytes))
             next(progress)