          self.template_string = template_string
          self.origin = origin
  
      def tokenize(self):
          "Return a list of tokens from a given template_string"
          in_tag = False
          result = []
          for bit in tag_re.split(self.template_string):
              if bit:
                  result.append(self.create_token(bit, in_tag))
 
</s> remove         "Compilation stage"
 </s> add  </s> remove         "The token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT"
 </s> add         # token_type must be TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK or TOKEN_COMMENT. </s> remove     def error(self, token, msg ):
 </s> add     def error(self, token, msg):
        "Return a list of tokens from a given template_string."
          self.template_string = template_string
          self.origin = origin
  
      def tokenize(self):
        "Return a list of tokens from a given template_string."
          in_tag = False
          result = []
          for bit in tag_re.split(self.template_string):
              if bit:
                  result.append(self.create_token(bit, in_tag))
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