Django

Code

Show
Ignore:
Timestamp:
06/07/08 12:10:16 (7 months ago)
Author:
brosner
Message:

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

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-7543 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-7583
  • django/branches/newforms-admin/django/template/__init__.py

    r7351 r7584  
    468468        2 
    469469        >>> fe.var 
    470         'variable' 
     470        <Variable: 'variable'> 
    471471 
    472472    This class should never be instantiated outside of the 
     
    599599    marks):: 
    600600 
    601         >>> c = {'article': {'section':'News'}} 
     601        >>> c = {'article': {'section':u'News'}} 
    602602        >>> Variable('article.section').resolve(c) 
    603603        u'News' 
    604604        >>> Variable('article').resolve(c) 
    605         {'section': 'News'} 
     605        {'section': u'News'} 
    606606        >>> class AClass: pass 
    607607        >>> c = AClass() 
    608608        >>> c.article = AClass() 
    609         >>> c.article.section = 'News' 
     609        >>> c.article.section = u'News' 
    610610        >>> Variable('article.section').resolve(c) 
    611611        u'News'