microdot 2.7.0__tar.gz → 2.8.0__tar.gz

{microdot-2.7.0/src/microdot.egg-info → microdot-2.8.0}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: microdot
-Version: 2.7.0
+Version: 2.8.0
 Summary: The impossibly small web framework for MicroPython
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License-Expression: MIT
 Project-URL: Homepage, https://code.miguelgrinberg.com/miguelgrinberg/microdot
 Project-URL: Documentation, https://microdot.readthedocs.io/
 Project-URL: Source Code, https://code.miguelgrinberg.com/miguelgrinberg/microdot
@@ -13,7 +14,6 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: MicroPython
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{microdot-2.7.0 → microdot-2.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "microdot"
-version = "2.7.0"
+version = "2.8.0"
 authors = [
     { name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com" },
 ]
@@ -10,9 +10,9 @@ classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: Implementation :: MicroPython",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
+license = "MIT"
 requires-python = ">=3.8"
 dependencies = [
 ]

{microdot-2.7.0 → microdot-2.8.0}/src/microdot/__init__.py

@@ -1,4 +1,4 @@
 from microdot.microdot import Microdot, Request, Response, abort, redirect, \
     send_file, URLPattern, AsyncBytesIO, iscoroutine  # noqa: F401
 
-__version__ = '2.7.0'
+__version__ = '2.8.0'

{microdot-2.7.0 → microdot-2.8.0}/src/microdot/microdot.py

@@ -495,8 +495,9 @@ class Request:
 
     @property
     def files(self):
-        """The files uploaded in the request as a dictionary, or ``None`` if
-        the request does not have any files.
+        """The files uploaded in the request as a
+        :class:`MultiDict <microdot.MultiDict>` object, or ``None`` if the
+        request does not have any files.
 
         The :func:`with_form_data <microdot.multipart.with_form_data>`
         decorator must be added to the route that receives file uploads for

{microdot-2.7.0 → microdot-2.8.0}/src/microdot/microdot.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Awaitable, BinaryIO, Callable, Iterable, Tuple
+from typing import Any, Awaitable, BinaryIO, Callable, Iterable, Tuple, TypeVar
 from asyncio import StreamReader, StreamWriter, Server
 from datetime import datetime
 from io import BytesIO
@@ -44,20 +44,23 @@ class NoCaseDict(dict):
 def mro(cls):
     ...
 
-class MultiDict(dict):
-    def __init__(self, initial_dict: dict[str, Any] | None = ...) -> None:
+_T = TypeVar('_T')
+
+
+class MultiDict[_T](dict[str, _T]):
+    def __init__(self, initial_dict: dict[str, _T] | None = ...) -> None:
         ...
 
-    def __setitem__(self, key: str, value: Any) -> None:
+    def __setitem__(self, key: str, value: _T) -> None:
         ...
 
-    def __getitem__(self, key: str) -> Any:
+    def __getitem__(self, key: str) -> _T:
         ...
 
-    def get(self, key: str, default: Any | None = ..., type: type | None = ...):
+    def get(self, key: str, default: _T | None = ..., type: type | None = ...) -> _T | None:  # type: ignore[override]
         ...
 
-    def getlist(self, key: str, type: type | None = ...) -> list[Any]:
+    def getlist(self, key: str, type: type | None = ...) -> list[_T]:
         ...
 
 
@@ -138,11 +141,11 @@ class Request:
         ...
 
     @property
-    def form(self) -> dict[str, str] | None:
+    def form(self) -> MultiDict[str] | None:
         ...
 
     @property
-    def files(self) -> dict[str, FileUpload]:
+    def files(self) -> MultiDict[FileUpload] | None:
         ...
 
     def after_request(self, f: Callable[[Request, "Response"], "Response" | Awaitable["Response"] | None | Awaitable[None]]):

{microdot-2.7.0 → microdot-2.8.0}/src/microdot/multipart.py

@@ -2,6 +2,7 @@ import os
 from random import choice
 from microdot import abort, iscoroutine, AsyncBytesIO
 from microdot.helpers import wraps
+from microdot.microdot import MultiDict
 
 
 class FormDataIter:
@@ -277,8 +278,8 @@ def with_form_data(f):
     """
     @wraps(f)
     async def wrapper(request, *args, **kwargs):
-        form = {}
-        files = {}
+        form = MultiDict()
+        files = MultiDict()
         async for name, value in FormDataIter(request):
             if isinstance(value, FileUpload):
                 files[name] = await value.copy()
@@ -293,7 +294,8 @@ def with_form_data(f):
                 ret = await ret
         finally:
             if request.files:
-                for file in request.files.values():
-                    await file.close()
+                for files in request.files.values():
+                    for file in files:
+                        await file.close()
         return ret
     return wrapper

{microdot-2.7.0 → microdot-2.8.0/src/microdot.egg-info}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: microdot
-Version: 2.7.0
+Version: 2.8.0
 Summary: The impossibly small web framework for MicroPython
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License-Expression: MIT
 Project-URL: Homepage, https://code.miguelgrinberg.com/miguelgrinberg/microdot
 Project-URL: Documentation, https://microdot.readthedocs.io/
 Project-URL: Source Code, https://code.miguelgrinberg.com/miguelgrinberg/microdot
@@ -13,7 +14,6 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: MicroPython
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{microdot-2.7.0 → microdot-2.8.0}/src/microdot.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ src/microdot.egg-info/dependency_links.txt
 src/microdot.egg-info/not-zip-safe
 src/microdot.egg-info/requires.txt
 src/microdot.egg-info/top_level.txt
+tests/.test_multipart.py.swp
 tests/__init__.py
 tests/mock_socket.py
 tests/test_asgi.py

{microdot-2.7.0 → microdot-2.8.0}/tests/test_multipart.py

@@ -22,12 +22,18 @@ class TestMultipart(unittest.TestCase):
         @app.post('/sync')
         @with_form_data
         def sync_route(req):
-            return dict(req.form)
+            d = {}
+            for key, value in req.form.items():
+                d[key] = value
+            return d
 
         @app.post('/async')
         @with_form_data
         async def async_route(req):
-            return dict(req.form)
+            d = {}
+            for key, value in req.form.items():
+                d[key] = value
+            return d
 
         client = TestClient(app)
 
@@ -43,7 +49,7 @@ class TestMultipart(unittest.TestCase):
                 b'--boundary--\r\n')
         ))
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(res.json, {'foo': 'bar', 'baz': 'baz'})
+        self.assertEqual(res.json, {'foo': ['bar'], 'baz': ['baz']})
 
         res = self._run(client.post(
             '/async', headers={
@@ -57,7 +63,7 @@ class TestMultipart(unittest.TestCase):
                 b'--boundary--\r\n')
         ))
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(res.json, {'foo': 'bar', 'baz': 'baz'})
+        self.assertEqual(res.json, {'foo': ['bar'], 'baz': ['baz']})
 
     def test_form_with_files(self):
         saved_max_memory_size = FileUpload.max_memory_size
@@ -68,10 +74,13 @@ class TestMultipart(unittest.TestCase):
         @app.post('/async')
         @with_form_data
         async def async_route(req):
-            d = dict(req.form)
-            for name, file in req.files.items():
-                d[name] = '{}|{}|{}'.format(file.filename, file.content_type,
-                                            (await file.read()).decode())
+            d = {}
+            for key, value in req.form.items():
+                d[key] = value
+            for name, files in req.files.items():
+                d[name] = '{}|{}|{}'.format(files[0].filename,
+                                            files[0].content_type,
+                                            (await files[0].read()).decode())
             return d
 
         client = TestClient(app)
@@ -94,7 +103,7 @@ class TestMultipart(unittest.TestCase):
                 b'--boundary--\r\n')
         ))
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(res.json, {'foo': 'bar', 'x': 'y',
+        self.assertEqual(res.json, {'foo': ['bar'], 'x': ['y'],
                                     'f': 'f|text/plain|baz',
                                     'g': 'g|text/html|<p>hello</p>'})
         FileUpload.max_memory_size = saved_max_memory_size
@@ -136,8 +145,9 @@ class TestMultipart(unittest.TestCase):
         @app.post('/async')
         @with_form_data
         async def async_route(req):
-            for _, file in req.files.items():
-                await file.save('_x.txt')
+            for _, files in req.files.items():
+                for file in files:
+                    await file.save('_x.txt')
 
         client = TestClient(app)
 
@@ -235,3 +245,51 @@ class TestMultipart(unittest.TestCase):
             'h': 'hh|text/plain|yyzz',
             'i': 'i.1|text/plain|1234',
         })
+
+    def test_form_with_duplicates(self):
+        app = Microdot()
+
+        @app.post('/submit')
+        @with_form_data
+        async def submit(req):
+            d = {}
+            for key, value in req.form.items():
+                d[key] = value
+            for name, files in req.files.items():
+                if name not in d:
+                    d[name] = []
+                for file in files:
+                    d[name].append('{}|{}|{}'.format(
+                        file.filename, file.content_type,
+                        (await file.read()).decode()))
+            return d
+
+        client = TestClient(app)
+
+        res = self._run(client.post(
+            '/submit', headers={
+                'Content-Type': 'multipart/form-data; boundary=boundary',
+            },
+            body=(
+                b'--boundary\r\n'
+                b'Content-Disposition: form-data; name="foo"\r\n\r\nbar\r\n'
+                b'--boundary\r\n'
+                b'Content-Disposition: form-data; name="foo"\r\n\r\nbaz\r\n'
+                b'--boundary\r\n'
+                b'Content-Disposition: form-data; name="f"; filename="f1"\r\n'
+                b'Content-Type: text/plain\r\n\r\nfile1\r\n'
+                b'--boundary\r\n'
+                b'Content-Disposition: form-data; name="f"; filename="f2"\r\n'
+                b'Content-Type: text/plain\r\n\r\nfile2\r\n'
+                b'--boundary\r\n'
+                b'Content-Disposition: form-data; name="g"; filename="g"\r\n'
+                b'Content-Type: text/html\r\n\r\n<p>hello</p>\r\n'
+                b'--boundary\r\n'
+                b'Content-Disposition: form-data; name="x"\r\n\r\ny\r\n'
+                b'--boundary--\r\n')
+        ))
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.json, {'foo': ['bar', 'baz'], 'x': ['y'],
+                                    'f': ['f1|text/plain|file1',
+                                          'f2|text/plain|file2'],
+                                    'g': ['g|text/html|<p>hello</p>']})