python-multipart 0.0.19__tar.gz → 0.0.21__tar.gz

{python_multipart-0.0.19 → python_multipart-0.0.21}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.21 (2025-12-17)
+
+* Add support for Python 3.14 and drop EOL 3.8 and 3.9 [#216](https://github.com/Kludex/python-multipart/pull/216).
+
+## 0.0.20 (2024-12-16)
+
+* Handle messages containing only end boundary [#142](https://github.com/Kludex/python-multipart/pull/142).
+
 ## 0.0.19 (2024-11-30)
 
 * Don't warn when CRLF is found after last boundary on `MultipartParser` [#193](https://github.com/Kludex/python-multipart/pull/193).

{python_multipart-0.0.19 → python_multipart-0.0.21}/PKG-INFO

@@ -1,13 +1,14 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: python-multipart
-Version: 0.0.19
+Version: 0.0.21
 Summary: A streaming multipart parser for Python
 Project-URL: Homepage, https://github.com/Kludex/python-multipart
 Project-URL: Documentation, https://kludex.github.io/python-multipart/
 Project-URL: Changelog, https://github.com/Kludex/python-multipart/blob/master/CHANGELOG.md
 Project-URL: Source, https://github.com/Kludex/python-multipart
 Author-email: Andrew Dunham <andrew@du.nham.ca>, Marcelo Trylesinski <marcelotryle@gmail.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
+License-File: LICENSE.txt
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -15,13 +16,13 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 
 # [Python-Multipart](https://kludex.github.io/python-multipart/)

{python_multipart-0.0.19 → python_multipart-0.0.21}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "A streaming multipart parser for Python"
 readme = "README.md"
 license = "Apache-2.0"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 authors = [
     { name = "Andrew Dunham", email = "andrew@du.nham.ca" },
     { name = "Marcelo Trylesinski", email = "marcelotryle@gmail.com" },
@@ -21,17 +21,17 @@ classifiers = [
     'Operating System :: OS Independent',
     'Programming Language :: Python :: 3 :: Only',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.8',
-    'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
     'Topic :: Software Development :: Libraries :: Python Modules',
 ]
 dependencies = []
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "atomicwrites==1.4.1",
     "attrs==23.2.0",
     "coverage==7.4.4",
@@ -44,10 +44,10 @@ dev-dependencies = [
     "PyYAML==6.0.1",
     "invoke==2.2.0",
     "pytest-timeout==2.3.1",
-    "ruff==0.8.0",
+    "ruff==0.11.7",
     "mypy",
     "types-PyYAML",
-    "atheris==2.3.0; python_version != '3.12'",
+    "atheris==2.3.0; python_version <= '3.11'",
     # Documentation
     "mkdocs",
     "mkdocs-material",

{python_multipart-0.0.19 → python_multipart-0.0.21}/python_multipart/__init__.py

@@ -2,7 +2,7 @@
 __author__ = "Andrew Dunham"
 __license__ = "Apache"
 __copyright__ = "Copyright (c) 2012-2013, Andrew Dunham"
-__version__ = "0.0.19"
+__version__ = "0.0.21"
 
 from .multipart import (
     BaseParser,

{python_multipart-0.0.19 → python_multipart-0.0.21}/python_multipart/decoders.py

@@ -62,7 +62,7 @@ class Base64Decoder:
 
         # Prepend any cache info to our data.
         if len(self.cache) > 0:
-            data = self.cache + data
+            data = bytes(self.cache) + data
 
         # Slice off a string that's a multiple of 4.
         decode_len = (len(data) // 4) * 4

{python_multipart-0.0.19 → python_multipart-0.0.21}/python_multipart/multipart.py

@@ -15,9 +15,8 @@ from .decoders import Base64Decoder, QuotedPrintableDecoder
 from .exceptions import FileError, FormParserError, MultipartParseError, QuerystringParseError
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing import Any, Callable, Literal, Protocol, TypedDict
-
-    from typing_extensions import TypeAlias
+    from collections.abc import Callable
+    from typing import Any, Literal, Protocol, TypeAlias, TypedDict
 
     class SupportsRead(Protocol):
         def read(self, __n: int) -> bytes: ...
@@ -130,7 +129,8 @@ class MultipartState(IntEnum):
     PART_DATA_START = 8
     PART_DATA = 9
     PART_DATA_END = 10
-    END = 11
+    END_BOUNDARY = 11
+    END = 12
 
 
 # Flags for the multipart parser.
@@ -331,7 +331,7 @@ class Field:
         else:
             v = repr(self.value)
 
-        return "{}(field_name={!r}, value={})".format(self.__class__.__name__, self.field_name, v)
+        return f"{self.__class__.__name__}(field_name={self.field_name!r}, value={v})"
 
 
 class File:
@@ -569,7 +569,7 @@ class File:
         self._fileobj.close()
 
     def __repr__(self) -> str:
-        return "{}(file_name={!r}, field_name={!r})".format(self.__class__.__name__, self.file_name, self.field_name)
+        return f"{self.__class__.__name__}(file_name={self.file_name!r}, field_name={self.field_name!r})"
 
 
 class BaseParser:
@@ -1119,7 +1119,10 @@ class MultipartParser(BaseParser):
                 # Check to ensure that the last 2 characters in our boundary
                 # are CRLF.
                 if index == len(boundary) - 2:
-                    if c != CR:
+                    if c == HYPHEN:
+                        # Potential empty message.
+                        state = MultipartState.END_BOUNDARY
+                    elif c != CR:
                         # Error!
                         msg = "Did not find CR at end of boundary (%d)" % (i,)
                         self.logger.warning(msg)
@@ -1237,7 +1240,7 @@ class MultipartParser(BaseParser):
             elif state == MultipartState.HEADER_VALUE_ALMOST_DONE:
                 # The last character should be a LF.  If not, it's an error.
                 if c != LF:
-                    msg = "Did not find LF character at end of header " "(found %r)" % (c,)
+                    msg = f"Did not find LF character at end of header (found {c!r})"
                     self.logger.warning(msg)
                     e = MultipartParseError(msg)
                     e.offset = i
@@ -1396,6 +1399,18 @@ class MultipartParser(BaseParser):
                     # the start of the boundary itself.
                     i -= 1
 
+            elif state == MultipartState.END_BOUNDARY:
+                if index == len(boundary) - 2 + 1:
+                    if c != HYPHEN:
+                        msg = "Did not find - at end of boundary (%d)" % (i,)
+                        self.logger.warning(msg)
+                        e = MultipartParseError(msg)
+                        e.offset = i
+                        raise e
+                    index += 1
+                    self.callback("end")
+                    state = MultipartState.END
+
             elif state == MultipartState.END:
                 # Don't do anything if chunk ends with CRLF.
                 if c == CR and i + 1 < length and data[i + 1] == LF:
@@ -1699,7 +1714,7 @@ class FormParser:
                 else:
                     self.logger.warning("Unknown Content-Transfer-Encoding: %r", transfer_encoding)
                     if self.config["UPLOAD_ERROR_ON_BAD_CTE"]:
-                        raise FormParserError('Unknown Content-Transfer-Encoding "{!r}"'.format(transfer_encoding))
+                        raise FormParserError(f'Unknown Content-Transfer-Encoding "{transfer_encoding!r}"')
                     else:
                         # If we aren't erroring, then we just treat this as an
                         # unencoded Content-Transfer-Encoding.
@@ -1707,8 +1722,8 @@ class FormParser:
 
             def _on_end() -> None:
                 nonlocal writer
-                assert writer is not None
-                writer.finalize()
+                if writer is not None:
+                    writer.finalize()
                 if self.on_end is not None:
                     self.on_end()
 
@@ -1730,7 +1745,7 @@ class FormParser:
 
         else:
             self.logger.warning("Unknown Content-Type: %r", content_type)
-            raise FormParserError("Unknown Content-Type: {}".format(content_type))
+            raise FormParserError(f"Unknown Content-Type: {content_type}")
 
         self.parser = parser
 
@@ -1760,7 +1775,7 @@ class FormParser:
             self.parser.close()
 
     def __repr__(self) -> str:
-        return "{}(content_type={!r}, parser={!r})".format(self.__class__.__name__, self.content_type, self.parser)
+        return f"{self.__class__.__name__}(content_type={self.content_type!r}, parser={self.parser!r})"
 
 
 def create_form_parser(

{python_multipart-0.0.19 → python_multipart-0.0.21}/tests/compat.py

@@ -8,7 +8,8 @@ import types
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Any, Callable
+    from collections.abc import Callable
+    from typing import Any
 
 
 def ensure_in_path(path: str) -> None:

python_multipart-0.0.21/tests/test_data/http/empty_message.http

@@ -0,0 +1 @@
+----boundary--

python_multipart-0.0.21/tests/test_data/http/empty_message.yaml

@@ -0,0 +1,2 @@
+boundary: --boundary
+expected: []

python_multipart-0.0.21/tests/test_data/http/empty_message_with_bad_end.http

@@ -0,0 +1 @@
+----boundary-X

python_multipart-0.0.21/tests/test_data/http/empty_message_with_bad_end.yaml

@@ -0,0 +1,3 @@
+boundary: --boundary
+expected:
+    error: 13

{python_multipart-0.0.19 → python_multipart-0.0.21}/tests/test_multipart.py

@@ -37,7 +37,8 @@ from python_multipart.multipart import (
 from .compat import parametrize, parametrize_class
 
 if TYPE_CHECKING:
-    from typing import Any, Iterator, TypedDict
+    from collections.abc import Iterator
+    from typing import Any, TypedDict
 
     from python_multipart.multipart import FieldProtocol, FileConfig, FileProtocol
 
@@ -1069,7 +1070,9 @@ class TestFormParser(unittest.TestCase):
 
         self.make("boundary")
         data = b"--Boundary\r\nfoobar"
-        with self.assertRaisesRegex(MultipartParseError, "Expected boundary character %r, got %r" % (b"b"[0], b"B"[0])):
+        with self.assertRaisesRegex(
+            MultipartParseError, "Expected boundary character {!r}, got {!r}".format(b"b"[0], b"B"[0])
+        ):
             self.f.write(data)
 
     def test_octet_stream(self) -> None: