browserfetch 0.10.0__tar.gz → 0.11.0__tar.gz

{browserfetch-0.10.0 → browserfetch-0.11.0}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: browserfetch
-Version: 0.10.0
+Version: 0.11.0
 Summary: fetch in Python using your browser! 
 Keywords: browser,fetch,python,cookies
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: pyperclip
 Requires-Dist: cyclopts

{browserfetch-0.10.0 → browserfetch-0.11.0}/browserfetch/__init__.py

@@ -1,4 +1,13 @@
-__version__ = '0.10.0'
+__version__ = '0.11.0'
+__all__ = [
+    'BrowserError',
+    'evaluate',
+    'fetch',
+    'get',
+    'post',
+    'Response',
+    'start_server',
+]
 import atexit
 from asyncio import (
     AbstractEventLoop,
@@ -10,10 +19,11 @@ from asyncio import (
 )
 from collections import defaultdict
 from dataclasses import dataclass
+from functools import partial as _partial
 from html import escape
-from json import dumps, loads
+from json import dumps as _dumps, loads
 from logging import getLogger
-from urllib.parse import urlencode
+from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 
 from aiohttp import ClientSession, ClientWebSocketResponse
 from aiohttp.web import (
@@ -34,6 +44,8 @@ hosts: defaultdict[
 # maps response event id to its response event or response dict
 responses: dict[int, Event | dict] = {}
 
+_jdumps = _partial(_dumps, separators=(',', ':'), ensure_ascii=False)
+
 
 class BrowserError(Exception):
     pass
@@ -83,7 +95,7 @@ async def _request(
     data['event_id'] = event_id
     responses[event_id] = response_ready
 
-    bytes_ = dumps(data).encode()
+    bytes_ = _jdumps(data).encode()
     if body is not None:
         bytes_ += b'\0' + body
 
@@ -147,7 +159,7 @@ async def _(request):
     try:
         await receive_responses(ws)
     except TypeError:
-        logger.info('host WebSocket was closed')
+        logger.info('WebSocket was closed by browser')
         hosts[host] = Event()
     return ws
 
@@ -175,7 +187,7 @@ async def _(request: Request) -> WebSocketResponse:
 
         r['event_id'] = relay_event_id
         body = r.pop('body')
-        await ws.send_bytes(dumps(r).encode() + b'\0' + body)
+        await ws.send_bytes(_jdumps(r).encode() + b'\0' + body)
 
 
 @routes.get('/')
@@ -251,7 +263,14 @@ async def fetch(
     :return: a dict of response values.
     """
     if params is not None:
-        url += urlencode(params)
+        parsed_url = urlparse(url)
+        url = urlunparse(
+            parsed_url._replace(
+                query=urlencode(
+                    parse_qsl(parsed_url.query) + [*params.items()]
+                )
+            )
+        )
 
     d = await _request(
         host,
@@ -291,7 +310,7 @@ async def post(
     url: str,
     *,
     params: dict | None = None,
-    data: bytes | dict | str | None = None,
+    data=None,
     form: dict | None = None,
     timeout: int | float = 95,
     options: dict | None = None,
@@ -308,7 +327,7 @@ async def post(
         elif isinstance(data, bytes):
             body = data
         else:
-            body = dumps(data).encode()
+            body = _jdumps(data).encode()
             headers = options.setdefault('headers', {})
             headers['Content-Type'] = 'application/json'
     elif form is not None:

browserfetch-0.11.0/tests/test_init.py

@@ -0,0 +1,25 @@
+from contextlib import suppress
+from unittest.mock import Mock, patch
+
+from browserfetch import fetch
+
+request_mock = Mock()
+
+
+@patch('browserfetch._request', new=request_mock)
+async def test_params():
+    with suppress(TypeError):
+        await fetch(
+            url='http://stackoverflow.com/search?q=question',
+            params={'lang': 'en', 'tag': 'python', 'q': True},
+        )
+    request_mock.assert_called_once_with(
+        None,  # host
+        {
+            'action': 'fetch',
+            'url': 'http://stackoverflow.com/search?q=question&lang=en&tag=python&q=True',
+            'options': None,
+            'timeout': 95,
+        },  # data
+        None,  # body
+    )