Stop overriding built-ins

Author: macro1

simple_history/manager.py

@@ -31,10 +31,10 @@ def get_queryset(self):
             return qs
 
         if isinstance(self.instance._meta.pk, models.OneToOneField):
-            filter = {self.instance._meta.pk.name + "_id": self.instance.pk}
+            key_name = self.instance._meta.pk.name + "_id"
         else:
-            filter = {self.instance._meta.pk.name: self.instance.pk}
-        return self.get_super_queryset().filter(**filter)
+            key_name = self.instance._meta.pk.name
+        return self.get_super_queryset().filter(**{key_name: self.instance.pk})
 
     get_query_set = get_queryset
 

simple_history/models.py

@@ -200,14 +200,14 @@ def post_save(self, instance, created, **kwargs):
     def post_delete(self, instance, **kwargs):
         self.create_historical_record(instance, '-')
 
-    def create_historical_record(self, instance, type):
+    def create_historical_record(self, instance, history_type):
         history_date = getattr(instance, '_history_date', now())
         history_user = self.get_history_user(instance)
         manager = getattr(instance, self.manager_name)
         attrs = {}
         for field in instance._meta.fields:
             attrs[field.attname] = getattr(instance, field.attname)
-        manager.create(history_date=history_date, history_type=type,
+        manager.create(history_date=history_date, history_type=history_type,
                        history_user=history_user, **attrs)
 
     def get_history_user(self, instance):