Added error dict to the exception

druids · Apr 8, 2021 · f1bd6c2 · f1bd6c2
1 parent d960a5b
commit f1bd6c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/chamber/exceptions/__init__.py b/chamber/exceptions/__init__.py
@@ -1,8 +1,9 @@
 class PersistenceException(Exception):
 
-    def __init__(self, message=None):
+    def __init__(self, message=None, error_dict=None):
         super().__init__()
         self.message = message
+        self.error_dict = error_dict
 
     def __str__(self):
         return repr(self.message)
diff --git a/chamber/models/__init__.py b/chamber/models/__init__.py
@@ -409,8 +409,12 @@ def _persistence_clean(self, *args, **kwargs):
             self.full_clean(exclude=exclude)
         except ValidationError as er:
             if hasattr(er, 'error_dict'):
-                raise PersistenceException(', '.join(
-                    ('%s: %s' % (key, ', '.join(map(force_text, val))) for key, val in er.message_dict.items())))
+                raise PersistenceException(
+                    ', '.join(
+                        ('%s: %s' % (key, ', '.join(map(force_text, val))) for key, val in er.message_dict.items())
+                    ),
+                    error_dict=er.message_dict
+                )
             else:
                 raise PersistenceException(', '.join(map(force_text, er.messages)))
 

diff --git a/example/dj/apps/test_chamber/tests/models/__init__.py b/example/dj/apps/test_chamber/tests/models/__init__.py
@@ -360,11 +360,11 @@ def test_smart_queryset_fast_distinct_shuld_keep_ordering(self):
         TestSmartModel.objects.create(name='c')
 
         assert_equal(
-            TestSmartModel.objects.order_by('name').fast_distinct().values_list('name', flat=True),
+            list(TestSmartModel.objects.order_by('name').fast_distinct().values_list('name', flat=True)),
             ['a', 'b', 'c']
         )
         assert_equal(
-            TestSmartModel.objects.order_by('-name').fast_distinct().values_list('name', flat=True),
+            list(TestSmartModel.objects.order_by('-name').fast_distinct().values_list('name', flat=True)),
             ['c', 'b', 'a']
         )
 

diff --git a/example/requirements.txt b/example/requirements.txt
@@ -1,10 +1,10 @@
-Django==3.1
+Django==3.1.6
 diff-match-patch==20110725.1
 django-germanium==2.1.0
 six==1.10.0
 coverage==5.3.1
 coveralls==2.2.0
-pillow==8.0.1
+Pillow==8.1.1
 boto3==1.16.47
 django-storages==1.11.1
 -e ../