Changeset 7642 for django/branches/gis/django/template/__init__.py

Timestamp:

06/15/08 19:34:17 (7 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7574-7583,7585-7586,7590-7602,7614-7615,7619-7625,7629,7632-7636 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/template/__init__.py (modified) (2 diffs)

django/branches/gis/django/template/__init__.py

@@ -468 +468 @@
-        2
-        >>> fe.var
-'variable'
+<Variable: 'variable'>
-
-    This class should never be instantiated outside of the
@@ -599 +599 @@
-    marks)::
-
-
+u
-        >>> Variable('article.section').resolve(c)
-        u'News'
-        >>> Variable('article').resolve(c)
-
+u
-        >>> class AClass: pass
-        >>> c = AClass()
-        >>> c.article = AClass()
-
+u
-        >>> Variable('article.section').resolve(c)
-        u'News'