Merge branch 'master' into empty_message

Author: Kludex

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.17 (2024-10-31)
+
+* Handle PermissionError in fallback code for old import name [#182](https://github.com/Kludex/python-multipart/pull/182).
+
 ## 0.0.16 (2024-10-27)
 
 * Add dunder attributes to `multipart` package [#177](https://github.com/Kludex/python-multipart/pull/177).

fuzz/fuzz_form.py

@@ -29,8 +29,15 @@ def parse_form_urlencoded(fdp: EnhancedDataProvider) -> None:
 
 
 def parse_multipart_form_data(fdp: EnhancedDataProvider) -> None:
-    header = {"Content-Type": "multipart/form-data; boundary=--boundary"}
-    parse_form(header, io.BytesIO(fdp.ConsumeRandomBytes()), on_field, on_file)
+    boundary = "boundary"
+    header = {"Content-Type": f"multipart/form-data; boundary={boundary}"}
+    body = (
+        f"--{boundary}\r\n"
+        f"Content-Type: multipart/form-data; boundary={boundary}\r\n\r\n"
+        f"{fdp.ConsumeRandomString()}\r\n"
+        f"--{boundary}--\r\n"
+    )
+    parse_form(header, io.BytesIO(body.encode("latin1", errors="ignore")), on_field, on_file)
 
 
 def TestOneInput(data: bytes) -> None:

multipart/__init__.py

@@ -7,14 +7,17 @@
 
 for p in sys.path:
     file_path = Path(p, "multipart.py")
-    if file_path.is_file():
-        spec = importlib.util.spec_from_file_location("multipart", file_path)
-        assert spec is not None, f"{file_path} found but not loadable!"
-        module = importlib.util.module_from_spec(spec)
-        sys.modules["multipart"] = module
-        assert spec.loader is not None, f"{file_path} must be loadable!"
-        spec.loader.exec_module(module)
-        break
+    try:
+        if file_path.is_file():
+            spec = importlib.util.spec_from_file_location("multipart", file_path)
+            assert spec is not None, f"{file_path} found but not loadable!"
+            module = importlib.util.module_from_spec(spec)
+            sys.modules["multipart"] = module
+            assert spec.loader is not None, f"{file_path} must be loadable!"
+            spec.loader.exec_module(module)
+            break
+    except PermissionError:
+        pass
 else:
     warnings.warn("Please use `import python_multipart` instead.", PendingDeprecationWarning, stacklevel=2)
     from python_multipart import *

python_multipart/__init__.py

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