django-filthyfields 2.0.2__tar.gz → 2.0.3__tar.gz

{django_filthyfields-2.0.2/src/django_filthyfields.egg-info → django_filthyfields-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-filthyfields
-Version: 2.0.2
+Version: 2.0.3
 Summary: Tracking dirty fields on a Django model instance.
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/oliverhaas/django-filthyfields

{django_filthyfields-2.0.2 → django_filthyfields-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-filthyfields"
-version = "2.0.2"
+version = "2.0.3"
 description = "Tracking dirty fields on a Django model instance."
 readme = "README.md"
 license = "BSD-3-Clause"
@@ -36,9 +36,10 @@ Repository = "https://github.com/oliverhaas/django-filthyfields.git"
 
 [dependency-groups]
 dev = [
-  "cython>=3.2.4",
+  "cython==3.2.4",
   "django-stubs==6.0.3",
   "mypy==1.20.2",
+  "pillow==12.2.0",
   "pre-commit==4.6.0",
   "pytest==9.0.3",
   "pytest-asyncio==1.3.0",
@@ -46,8 +47,8 @@ dev = [
   "pytest-django==4.12.0",
   "pytest-xdist==3.8.0",
   "ruff==0.15.12",
-  "setuptools>=80.10.1",
-  "ty==0.0.32",
+  "setuptools==82.0.1",
+  "ty==0.0.33",
 ]
 docs = ["mkdocs==1.6.1", "mkdocs-material==9.7.6", "mike==2.2.0"]
 
@@ -180,5 +181,8 @@ python_version = "3.14"
 strict = true
 plugins = ["mypy_django_plugin.main"]
 
+[tool.ty.environment]
+python-version = "3.14"
+
 [tool.django-stubs]
 django_settings_module = "tests.django_settings"

{django_filthyfields-2.0.2 → django_filthyfields-2.0.3/src/django_filthyfields.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-filthyfields
-Version: 2.0.2
+Version: 2.0.3
 Summary: Tracking dirty fields on a Django model instance.
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://github.com/oliverhaas/django-filthyfields

{django_filthyfields-2.0.2 → django_filthyfields-2.0.3}/src/filthyfields/filthyfields.py

@@ -54,12 +54,26 @@ class _TrackingFieldFileMixin:
     """``FieldFile`` mixin that records ``save()`` / ``delete()`` into the instance's diff."""
 
     def save(self, name: str, content: File[Any], save: bool = True) -> None:
+        instance = self.instance  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
+        field_name = self.field.name  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
         old_name = self.name or ""  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
-        super().save(name, content, save=save)  # type: ignore[misc]  # ty: ignore[unresolved-attribute]
+        # Suppress _FileDiffDescriptor tracking during super().save: Django's
+        # FieldFile.save mutates self.name then calls _set_instance_attribute,
+        # which (for ImageFieldFile) does setattr(instance, attname, content).
+        # That hits __set__ with a stale-relative-to-mixin baseline and writes
+        # a wrong entry to _state_diff. The mixin is the source of truth here.
+        # The set is left in __dict__ even when empty so a concurrent thread
+        # under free-threading can't pop it between our discard and another
+        # thread's setdefault — set.add/discard/membership are atomic.
+        inflight = instance.__dict__.setdefault("_dirty_filefield_inflight", set())
+        inflight.add(field_name)
+        try:
+            super().save(name, content, save=save)  # type: ignore[misc]  # ty: ignore[unresolved-attribute]
+        finally:
+            inflight.discard(field_name)
         new_name = self.name or ""  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
-        instance = self.instance  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
         if not instance._state.adding:
-            _track_file_change(instance, self.field.name, old_name, new_name)  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
+            _track_file_change(instance, field_name, old_name, new_name)
 
     def delete(self, save: bool = True) -> None:
         old_name = self.name or ""  # type: ignore[attr-defined]  # ty: ignore[unresolved-attribute]
@@ -102,9 +116,13 @@ class _FileDiffDescriptor(FileDescriptor):
         attname = self.field.attname
         field_name = self.field.name
 
+        # FieldFile.save sets a sentinel for the duration of super().save so the
+        # mixin owns tracking; we must not record a diff entry from this path.
+        inflight = d.get("_dirty_filefield_inflight")
         state = getattr(instance, "_state", None)
         should_track = (
-            state is not None
+            (inflight is None or field_name not in inflight)
+            and state is not None
             and not state.adding
             and attname in d
             and _should_track_field(instance, field_name, attname)