From 3e3282392d910d3a243fabb82da1efdde3e1e36a Mon Sep 17 00:00:00 2001 From: Jan-Jelle Kester Date: Wed, 18 Dec 2013 17:16:39 +0100 Subject: [PATCH] Make the set_actor method from the middleware static. Also, catch only the relevant exception. --- src/auditlog/middleware.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/auditlog/middleware.py b/src/auditlog/middleware.py index 5f6366b..454fbc7 100644 --- a/src/auditlog/middleware.py +++ b/src/auditlog/middleware.py @@ -33,7 +33,8 @@ class AuditlogMiddleware(object): return response - def set_actor(self, user, sender, instance, **kwargs): + @staticmethod + def set_actor(user, sender, instance, **kwargs): """ Signal receiver with an extra, required 'user' kwarg. This method becomes a real (valid) signal receiver when it is curried with the actor. @@ -41,7 +42,7 @@ class AuditlogMiddleware(object): try: app_label, model_name = settings.AUTH_USER_MODEL.split('.') auth_user_model = get_model(app_label, model_name) - except: + except ValueError: auth_user_model = get_model('auth', 'user') if sender == LogEntry and isinstance(user, auth_user_model) and instance.actor is None: instance.actor = user