          arg = settings.DATE_FORMAT
      return format(value, arg)
  
  def time(value, arg=None):
      "Formats a time according to the given format"
      from django.utils.dateformat import time_format
      if value in (None, u''):
          return u''
      if arg is None:
          arg = settings.TIME_FORMAT
 
</s> remove     "Formats a date according to the given format"
 </s> add     """Formats a date according to the given format.""" </s> remove     'Formats a date as the time since that date (i.e. "4 days, 6 hours")'
 </s> add     """Formats a date as the time since that date (i.e. "4 days, 6 hours").""" </s> remove     "If value is None, use given default"
 </s> add     """If value is None, use given default.""" </s> remove     "Removes all values of arg from the given string"
 </s> add     """Removes all values of arg from the given string.""" </s> remove     "If value is unavailable, use given default"
 </s> add     """If value is unavailable, use given default."""
    """Formats a time according to the given format."""
          arg = settings.DATE_FORMAT
      return format(value, arg)
  
  def time(value, arg=None):
    """Formats a time according to the given format."""
      from django.utils.dateformat import time_format
      if value in (None, u''):
          return u''
      if arg is None:
          arg = settings.TIME_FORMAT
keep keep keep keep replace keep keep keep keep keep
 Style and import fixes.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6641 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/template/defaultfilters.py