      return parser.parse()
  
  class Token(object):
      def __init__(self, token_type, contents):
          "The token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT"
          self.token_type, self.contents = token_type, contents
  
      def __str__(self):
          return '<%s token: "%s...">' % \
              ({TOKEN_TEXT: 'Text', TOKEN_VAR: 'Var', TOKEN_BLOCK: 'Block', TOKEN_COMMENT: 'Comment'}[self.token_type],
 
</s> remove     def error(self, token, msg ):
 </s> add     def error(self, token, msg): </s> remove         "Compilation stage"
 </s> add  </s> remove         "Return a list of tokens from a given template_string"
 </s> add         "Return a list of tokens from a given template_string."
        # token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT.
      return parser.parse()
  
  class Token(object):
      def __init__(self, token_type, contents):
        # token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT.
          self.token_type, self.contents = token_type, contents
  
      def __str__(self):
          return '<%s token: "%s...">' % \
              ({TOKEN_TEXT: 'Text', TOKEN_VAR: 'Var', TOKEN_BLOCK: 'Block', TOKEN_COMMENT: 'Comment'}[self.token_type],
keep keep keep keep replace keep keep keep keep keep
 Negligible changes to django.template -- removed a useless docstring, converted another one to a comment

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6974 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/template/__init__.py