Django

Code

Show
Ignore:
Timestamp:
03/13/08 01:14:26 (10 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7232]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7120 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7232
  • django/branches/newforms-admin/django/contrib/auth/decorators.py

    r6761 r7233  
     1try: 
     2    from functools import wraps, update_wrapper 
     3except ImportError: 
     4    from django.utils.functional import wraps, update_wrapper  # Python 2.3, 2.4 fallback. 
     5 
    16from django.contrib.auth import REDIRECT_FIELD_NAME 
    27from django.http import HttpResponseRedirect 
     
    5257        self.login_url = login_url 
    5358        self.redirect_field_name = redirect_field_name 
    54         self.__name__ = view_func.__name__ 
     59        update_wrapper(self, view_func) 
    5560         
    5661    def __get__(self, obj, cls=None):