Django

Code

Show
Ignore:
Timestamp:
01/17/08 12:12:24 (1 year ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7021].

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-6952 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-7021
  • django/branches/newforms-admin/django/template/context.py

    r6864 r7022  
    1010class Context(object): 
    1111    "A stack container for variable context" 
    12  
    1312    def __init__(self, dict_=None, autoescape=True): 
    1413        dict_ = dict_ or {} 
     
    7978                mod = __import__(module, {}, {}, [attr]) 
    8079            except ImportError, e: 
    81                 raise ImproperlyConfigured, 'Error importing request processor module %s: "%s"' % (module, e
     80                raise ImproperlyConfigured('Error importing request processor module %s: "%s"' % (module, e)
    8281            try: 
    8382                func = getattr(mod, attr) 
    8483            except AttributeError: 
    85                 raise ImproperlyConfigured, 'Module "%s" does not define a "%s" callable request processor' % (module, attr
     84                raise ImproperlyConfigured('Module "%s" does not define a "%s" callable request processor' % (module, attr)
    8685            processors.append(func) 
    8786        _standard_context_processors = tuple(processors) 
     
    103102        for processor in get_standard_processors() + processors: 
    104103            self.update(processor(request)) 
    105