Update to work with python 3.13 and begin moving away from os.path

Author: spm5065

docker-compose.yaml

@@ -10,7 +10,7 @@ services:
     environment:
      - PYTHONPATH=/code
      - PYTHONUNBUFFERED=0
-    command: sh -c "pip install -r requirements.txt;py.test test -s -v --junit-xml test_result.xml;pip install 'aiofiles>=0.4.0';py.test test_async -s -v --junit-xml test_result_async.xml"
+    command: sh -c "pip install -r requirements.txt;pip install 'Exscript';py.test test -s -v --junit-xml test_result.xml;pip install 'aiofiles>=0.4.0';py.test test_async -s -v --junit-xml test_result_async.xml; sleep 1800"
 
   emulator:
     image: swind/android-emulator:android_28
@@ -19,5 +19,7 @@ services:
      - ANDROID_EMULATOR_EXTRA_ARGS=-skin 1080x1920 -memory 2048 -no-boot-anim -gpu host -qemu
     ports:
       - 6080:6080
+    group_add:
+      - keep-groups
     devices:
       - "/dev/kvm:/dev/kvm"

ppadb/device.py

@@ -1,5 +1,6 @@
 import re
 import os
+from pathlib import Path, PurePosixPath
 
 from ppadb.command.transport import Transport
 from ppadb.command.serial import Serial
@@ -30,17 +31,6 @@
     from pipes import quote as cmd_quote
 
 
-def _get_src_info(src):
-    """Get information about the contents of a folder; used in :meth:`Device.push`."""
-    exists = os.path.exists(src)
-    isfile = os.path.isfile(src)
-    isdir = os.path.isdir(src)
-    basename = os.path.basename(src)
-    walk = None if not isdir else list(os.walk(src))
-
-    return exists, isfile, isdir, basename, walk
-
-
 class Device(Transport, Serial, Input, Utils, WM, Traffic, CPUStat, BatteryStats):
     INSTALL_RESULT_PATTERN = "(Success|Failure|Error)\s?(.*)"
     UNINSTALL_RESULT_PATTERN = "(Success|Failure.*|.*Unknown package:.*)"
@@ -66,22 +56,23 @@ def _push(self, src, dest, mode, progress):
             sync.push(src, dest, mode, progress)
 
     def push(self, src, dest, mode=0o644, progress=None):
-        exists, isfile, isdir, basename, walk = _get_src_info(src)
-        if not exists:
+        src = Path(src)
+        dest = PurePosixPath(dest)
+        if not src.exists():
             raise FileNotFoundError("Cannot find {}".format(src))
 
-        if isfile:
+        if src.is_file():
             self._push(src, dest, mode, progress)
+        elif src.is_dir():
+            src.resolve()
+            for root, dirs, files in src.walk():
+                subdir = root.relative_to(src)
+                destdir = dest / src.name / subdir
 
-        elif isdir:
-            for root, dirs, files in walk:
-                subdir = os.path.relpath(root, src)
-                root_dir_path = os.path.normpath(os.path.join(basename, subdir))
-
-                self.shell('mkdir -p "{}"'.format(os.path.normpath(os.path.join(dest, root_dir_path))))
+                self.shell(f'mkdir -p "{destdir}"')
 
                 for item in files:
-                    self._push(os.path.normpath(os.path.join(root, item)), os.path.normpath(os.path.join(dest, root_dir_path, item)), mode, progress)
+                    self._push(root / item, destdir / item, mode, progress)
 
     def pull(self, src, dest):
         sync_conn = self.sync()

ppadb/device_async.py

@@ -3,11 +3,11 @@
 except ImportError:  # pragma: no cover
     from asyncio import get_event_loop as get_running_loop  # Python 3.6 compatibility
 
-import re
 import os
+from pathlib import Path, PurePosixPath
+import re
 
 from ppadb.command.transport_async import TransportAsync
-from ppadb.device import _get_src_info
 from ppadb.sync_async import SyncAsync
 
 
@@ -36,22 +36,23 @@ async def _push(self, src, dest, mode, progress):
             await sync.push(src, dest, mode, progress)
 
     async def push(self, src, dest, mode=0o644, progress=None):
-        exists, isfile, isdir, basename, walk = await get_running_loop().run_in_executor(None, _get_src_info, src)
-        if not exists:
+        src = Path(src)
+        dest = PurePosixPath(dest)
+        if not src.exists():
             raise FileNotFoundError("Cannot find {}".format(src))
 
-        if isfile:
+        if src.is_file():
             await self._push(src, dest, mode, progress)
+        elif src.is_dir():
+            src.resolve()
+            for root, dirs, files in src.walk():
+                subdir = root.relative_to(src)
+                destdir = dest / src.name / subdir
 
-        elif isdir:
-            for root, dirs, files in walk:
-                subdir = os.path.relpath(root, src)
-                root_dir_path = os.path.normpath(os.path.join(basename, subdir))
-
-                await self.shell('mkdir -p "{}"'.format(os.path.normpath(os.path.join(dest, root_dir_path))))
+                await self.shell(f'mkdir -p "{destdir}"')
 
                 for item in files:
-                    await self._push(os.path.normpath(os.path.join(root, item)), os.path.normpath(os.path.join(dest, root_dir_path, item)), mode, progress)
+                    await self._push(root / item, destdir / item, mode, progress)
 
     async def pull(self, src, dest):
         sync_conn = await self.sync()

test/conftest.py

@@ -1,5 +1,5 @@
 import time
-import telnetlib
+import Exscript.protocols.telnetlib as telnetlib
 
 import pytest
 

test/test_device.py

@@ -148,6 +148,16 @@ def test_push_dir(device):
     assert "app-x86.apk" in result
 
 
+def test_push_recurse_dir(device):
+    dir_path = os.path.dirname(os.path.realpath(__file__))
+    apk_path = os.path.join(dir_path, "resources")
+    device.push(apk_path, "/sdcard")
+
+    result = device.shell("ls /sdcard/resources/apk")
+    assert "app-armeabi-v7a.apk" in result
+    assert "app-x86.apk" in result
+
+
 def test_push_with_progress(device):
     dir_path = os.path.dirname(os.path.realpath(__file__))
     apk_path = os.path.join(dir_path, "resources/apk/app-x86.apk")

test_async/async_wrapper.py

@@ -5,6 +5,8 @@
 
 def _await(coro):
     with warnings.catch_warnings(record=True) as warns:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
         ret = asyncio.get_event_loop().run_until_complete(coro)
 
         if warns:

test_async/test_client_async.py

@@ -24,6 +24,7 @@ async def test_create_connection_fail(self):
         with self.assertRaises(RuntimeError):
             await self.client.create_connection()
 
+
     @awaiter
     async def test_device_returns_none(self):
         with async_patch('asyncio.open_connection', return_value=(FakeStreamReader(), FakeStreamWriter())):

test_async/test_device_async.py

@@ -6,6 +6,7 @@
 import asyncio
 from contextlib import asynccontextmanager
 import os
+import pathlib
 import sys
 import unittest
 from unittest.mock import mock_open, patch
@@ -82,7 +83,7 @@ def progress(*args, **kwargs):
 
     @awaiter
     async def test_push_dir(self):
-        with patch('os.path.exists', return_value=True), patch('os.path.isfile', return_value=False), patch('os.path.isdir', return_value=True), patch('os.walk', return_value=[('root1', 'dirs1', 'files1'), ('root2', 'dirs2', 'files2')]):
+        with patch('pathlib.Path.exists', return_value=True), patch('os.path.isfile', return_value=False), patch('os.path.isdir', return_value=True), patch('os.walk', return_value=[('root1', 'dirs1', 'files1'), ('root2', 'dirs2', 'files2')]):
             with async_patch('ppadb.device_async.DeviceAsync.shell'), async_patch('ppadb.device_async.DeviceAsync._push'):
                 await self.device.push('src', 'dest')