Ticket #6434: 6434-dyn.patch

django/db/models/fields/__init__.py

@@ -2 +2 @@
 import datetime
 import os
 import time
+import warnings
 try:
     import decimal
 except ImportError:
@@ -46 +47 @@
         return
     raise validators.ValidationError, _("%(optname)s with this %(fieldname)s already exists.") % {'optname': capfirst(opts.verbose_name), 'fieldname': f.verbose_name}
 
+def create_auto_field(base, value_func, always):
+    class Klass(base):
+        def __init__(self, *args, **kwargs):
+            kwargs['editable'] = False
+            kwargs['blank'] = True
+            super(base, self).__init__(self, *args, **kwargs)
+
+        def pre_save(self, model_instance, add):
+            if always or add:
+                setattr(model_instance, self.attname, value_func())
+
+            return getattr(model_instance, self.attname)
+
 # A guide to Field parameters:
 #
 #   * name:      The name of the field specifed in the model.
@@ -416 +430 @@
                 flat.append((choice,value))
         return flat
     flatchoices = property(_get_flatchoices)
-    
+
     def save_form_data(self, instance, data):
         setattr(instance, self.name, data)
 
@@ -531 +545 @@
         self.auto_now, self.auto_now_add = auto_now, auto_now_add
         #HACKs : auto_now_add/auto_now should be done as a default or a pre_save.
         if auto_now or auto_now_add:
+            self._issue_warning()
             kwargs['editable'] = False
             kwargs['blank'] = True
         Field.__init__(self, verbose_name, name, **kwargs)
@@ -610 +625 @@
         defaults.update(kwargs)
         return super(DateField, self).formfield(**defaults)
 
+    def _issue_warning(self):
+        internal_type = self.get_internal_type()
+        warnings.warn(
+            message = "auto_now_add and auto_now are deprecated; use Created%s or Modified%s instead" % (internal_type, internal_type),
+            category = DeprecationWarning,
+            stacklevel = 4
+        )
+
+AutoAddDateField = create_auto_field(
+    base=DateField,
+    value_func=datetime.date.today,
+    always=False)
+
+AutoDateField = create_auto_field(
+    base=DateField,
+    value_func=datetime.date.today,
+    always=True)
+
 class DateTimeField(DateField):
     def get_internal_type(self):
         return "DateTimeField"
@@ -683 +716 @@
         defaults.update(kwargs)
         return super(DateTimeField, self).formfield(**defaults)
 
+    def _issue_warning(self):
+        internal_type = self.get_internal_type()
+        warnings.warn(
+            message = "auto_now_add and auto_now are deprecated; use Created%s and Modified%s" % (internal_type, internal_type),
+            category = DeprecationWarning,
+            stacklevel = 5
+        )
+
+AutoAddDateTimeField = create_auto_field(
+    base=DateTimeField,
+    value_func=datetime.datetime.now,
+    always=False)
+
+AutoDateTimeField = create_auto_field(
+    base=DateTimeField,
+    value_func=datetime.datetime.now,
+    always=True)
+
 class DecimalField(Field):
     empty_strings_allowed = False
     def __init__(self, verbose_name=None, name=None, max_digits=None, decimal_places=None, **kwargs):
@@ -1152 +1203 @@
         defaults.update(kwargs)
         return super(TimeField, self).formfield(**defaults)
 
+AutoAddTimeField = create_auto_field(
+    base=TimeField,
+    value_func=lambda: datetime.datetime.now().time(),
+    always=False)
+
+AutoTimeField = create_auto_field(
+    base=TimeField,
+    value_func=lambda: datetime.datetime.now().time(),
+    always=True)
+
 class URLField(CharField):
     def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
         kwargs['max_length'] = kwargs.get('max_length', 200)

docs/model-api.txt

@@ -116 +116 @@
 
 Here are all available field types:
 
+``AutoAddDateField``
+~~~~~~~~~~~~~~~~~~~~
+
+See `DateField`_ below.
+
+``AutoAddDateTimeField``
+~~~~~~~~~~~~~~~~~~~~
+
+See `DateTimeField`_ below.
+
+``AutoAddTimeField``
+~~~~~~~~~~~~~~~~~~~~
+
+See `TimeField`_ below.
+
+``AutoDateField``
+~~~~~~~~~~~~~~~~~~~~
+
+See `DateField`_ below.
+
+``AutoDateTimeField``
+~~~~~~~~~~~~~~~~~~~~
+
+See `DateTimeField`_ below.
+
 ``AutoField``
 ~~~~~~~~~~~~~
 
@@ -124 +149 @@
 automatically be added to your model if you don't specify otherwise. See
 `Automatic primary key fields`_.
 
+``AutoTimeField``
+~~~~~~~~~~~~~~~~~~~~
+
+See `TimeField`_ below.
+
 ``BooleanField``
 ~~~~~~~~~~~~~~~~
 
@@ -175 +205 @@
                             override.
     ======================  ===================================================
 
+In the Django development version, ``auto_now`` and ``auto_now_add`` are
+deprecated in favor of ``AutoDateField`` and ``AutoAddDateField``. The former
+replaces ``auto_now``, the latter ``auto_now_add`` while providing the same
+functionality.
+
 The admin represents this as an ``<input type="text">`` with a JavaScript
 calendar, and a shortcut for "Today."  The JavaScript calendar will always start
 the week on a Sunday.
@@ -184 +219 @@
 
 A date and time field. Takes the same extra options as ``DateField``.
 
+In the Django development version, ``auto_now`` and ``auto_now_add`` are deprecated
+in favor of ``AutoDateTimeField`` and ``AutoAddDateTimeField``. The former
+replaces ``auto_now``, the latter ``auto_now_add`` while providing the same
+functionality.
+
 The admin represents this as two ``<input type="text">`` fields, with
 JavaScript shortcuts.
 
@@ -571 +611 @@
         ('unknown', 'Unknown'),
     )
 
-The first element in each tuple is the name to apply to the group. The 
+The first element in each tuple is the name to apply to the group. The
 second element is an iterable of 2-tuples, with each 2-tuple containing
-a value and a human-readable name for an option. Grouped options may be 
-combined with ungrouped options within a single list (such as the 
+a value and a human-readable name for an option. Grouped options may be
+combined with ungrouped options within a single list (such as the
 `unknown` option in this example).
 
 For each model field that has ``choices`` set, Django will add a method to