          return timesince(arg, value)
      return timesince(value)
  
  def timeuntil(value, arg=None):
      'Formats a date as the time until that date (i.e. "4 days, 6 hours")'
      from django.utils.timesince import timesince
      from datetime import datetime
      if not value:
          return u''
      if arg:
 
</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     "Formats a date according to the given format"
 </s> add     """Formats a date according to the given format.""" </s> remove     "Formats a time according to the given format"
 </s> add     """Formats a time according to the given format.""" </s> remove     2. If given a variable, check whether that variable has changed. For example, the
       following shows the date every time it changes, but only shows the hour if both
       the hour and the date have changed::
 </s> add     2. If given a variable, check whether that variable has changed.
       For example, the following shows the date every time it changes, but
       only shows the hour if both the hour and the date have changed:: </s> remove     of the block are output:

    ::
 </s> add     of the block are output::
    """Formats a date as the time until that date (i.e. "4 days, 6 hours")."""
          return timesince(arg, value)
      return timesince(value)
  
  def timeuntil(value, arg=None):
    """Formats a date as the time until that date (i.e. "4 days, 6 hours")."""
      from django.utils.timesince import timesince
      from datetime import datetime
      if not value:
          return u''
      if arg:
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