Merge branch 'master' into nanterre-recette

2017-10-21 22:19:20 +02:00 · 2017-10-21 22:19:20 +02:00 · 8d4a4264e0
parent d562b0e3f0 0fc8daac52
commit 8d4a4264e0
1 changed files with 1 additions and 1 deletions
--- a/zoo/zoo_nanterre/api_views.py
+++ b/zoo/zoo_nanterre/api_views.py
@ -1822,7 +1822,7 @@ class DoublonMixin(object):
            assert len(p) == 2
            p = utils.pair_sort(*p)
            return self.get_queryset().get(first_id=p[0], second_id=p[1])
-        except (ValueError, TypeError, models.Duplicate.DoesNotExist):
+        except (AssertionError, ValueError, TypeError, models.Duplicate.DoesNotExist):
            return None