Changes between Version 6 and Version 7 of AuditTrail

Timestamp:

Sep 5, 2007, 10:09:08 AM (17 years ago)

Author:

Marty Alchin <gulopine@…>

Comment:

Updated to use Python's standard copy module.

AuditTrail

@@ -131 +131 @@
 from django.db import models
 from django.core.exceptions import ImproperlyConfigured
+import copy
 import re
 import types
@@ -266 +267 @@
         if field.name in attrs:
             raise ImproperlyConfigured, "%s cannot use %s as it is needed by AuditTrail." % (cls.__name__, field.attname)
-        #attrs[field.attname] = copy_field(field)
-        attrs[field.name] = copy_field(field)
+        if isinstance(field, models.AutoField):
+            # Audit models have a separate AutoField
+            attrs[field.name] = models.IntegerField(db_index=True, editable=False)
+        else:
+            attrs[field.name] = copy.copy(field)
 
     for track_field in _track_fields(kwargs['track_fields']):
         if track_field['name'] in attrs:
             raise NameError('Field named "%s" already exists in audit version of %s' % (track_field['name'], cls.__name__))
-        attrs[track_field['name']] = copy_field(track_field['field'])
+        attrs[track_field['name']] = copy.copy(track_field['field'])
     
     return type(name, (models.Model,), attrs)
-
-def copy_field(field):
-    """Copy an instantiated field to a new instantiated field"""
-    if isinstance(field, models.AutoField):
-        # Audit models have a separate AutoField
-        return models.IntegerField(db_index=True, editable=False)
-
-    copied_field = None
-    cls = field.__class__
-
-    # Use the field's attributes to start with
-    kwargs = field.__dict__.copy()
-
-    # Swap primary keys for ordinary indexes
-    if field.primary_key:
-        kwargs['db_index'] = True
-        del kwargs['primary_key']
-
-    # Some hackery to copy the field
-    while copied_field is None:
-        try:
-            if isinstance(field, models.ForeignKey):
-                copied_field = cls(field.rel.to, **kwargs)
-            elif isinstance(field, models.OneToOneField):
-                copied_field = models.ForeignKey(field.rel.to, **kwargs)
-            else:
-                copied_field = cls(**kwargs)
-        except (TypeError, ValueError), e:
-            # Some attributes, like creation_counter, aren't valid arguments
-            # So try to remove that argument so the field can try again
-            try:
-                del kwargs[value_error_re.match(str(e)).group(1)]
-            except:
-                # The attribute was already removed, and something's still going wrong
-                raise e
-
-    return copied_field
 
 def _build_track_field(track_item):