Bugfix for p2p_addr_explode() on non-posix platforms

[test-312-latest]
[pypi]

.github/workflows/python-package.yml

@@ -58,28 +58,3 @@ jobs:
     - name: Build wheel
       run: |
         python -m build
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.9'
-
-    - name: Build wheel
-      run: |
-        python -m pip install --upgrade pip
-        pip install build '.[car,dev]'
-        python -m build
-
-    - name: Upload to PyPI
-      if: contains(toJson(github.event.commits), '[pypi-deploy]') == true
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        pip install twine
-        twine check dist/*.whl

aioipfs/__init__.py

@@ -1,9 +1,10 @@
-__version__ = '0.6.9'
+__version__ = '0.7.0'
 
 from yarl import URL
 from distutils.version import StrictVersion  # type: ignore
 from typing import Union
 
+import async_timeout
 import asyncio
 import aiohttp
 import ipaddress
@@ -352,6 +353,12 @@ def allocate_tcp_maddr(self) -> Multiaddr:
             # Shouldn't assume dns4 here
             return Multiaddr(f'/dns4/{self.host}/tcp/{port}')
 
+    def timeout(self, time: float) -> async_timeout.Timeout:
+        return async_timeout.timeout(time)
+
+    def timeout_at(self, time: float) -> async_timeout.Timeout:
+        return async_timeout.timeout_at(time)
+
     async def __aenter__(self):
         return self
 

aioipfs/helpers.py

@@ -7,7 +7,7 @@
 from contextlib import closing
 from typing import Union
 import socket
-import os.path
+import posixpath
 
 from urllib.parse import quote
 
@@ -130,7 +130,7 @@ def p2p_addr_explode(addr: str) -> tuple:
 
     peer_id_re = re.compile(r'([\w]){46,59}$')
 
-    parts = addr.lstrip(os.path.sep).split(os.path.sep)
+    parts = addr.lstrip('/').split('/')
     try:
         assert parts.pop(0) == 'p2p'
         peer_id = parts.pop(0)
@@ -162,7 +162,7 @@ def p2p_addr_explode(addr: str) -> tuple:
                 assert len(parts) == 0
                 break
 
-        return peer_id, os.path.sep + os.path.join(*proto_a), p_version
+        return peer_id, '/' + posixpath.join(*proto_a), p_version
     except Exception as err:
         raise ValueError(f'Invalid p2p endpoint addr: {err}')
 

pyproject.toml

@@ -30,6 +30,7 @@ urls = {Homepage = "https://gitlab.com/cipres/aioipfs"}
 dependencies = [
     "aiohttp>=3.7.4",
     "aiofiles>=0.7.0",
+    "async-timeout>=4.0.3",
     "base58>=1.0.2",
     "gitignore-parser==0.1.9",
     "multiaddr>=0.0.9",

tests/test_client.py

@@ -146,6 +146,16 @@ async def test_basic(self, event_loop, ipfsdaemon, iclient):
         await iclient.core.version()
         await iclient.commands()
 
+    @pytest.mark.asyncio
+    async def test_timeout(self, event_loop, iclient):
+        with pytest.raises(asyncio.TimeoutError):
+            async with iclient.timeout(1):
+                await asyncio.sleep(3)
+
+        with pytest.raises(asyncio.TimeoutError):
+            async with iclient.timeout_at(event_loop.time() + 2):
+                await asyncio.sleep(4)
+
     @pytest.mark.asyncio
     async def test_bootstrap(self, event_loop, ipfsdaemon, iclient):
         await iclient.bootstrap.list()