Changeset 817

Timestamp:

10/09/05 09:40:10 (3 years ago)

Author:

rjwittams

Message:

clean up token parsing for error stuff and removed debug statements.

Files:

• django/branches/new-admin/django/core/template.py (modified) (2 diffs)
• django/branches/new-admin/django/views/admin/main.py (modified) (1 diff)

django/branches/new-admin/django/core/template.py

@@ -114 +114 @@
-        "Compilation stage"
-        self.nodelist = compile_string(template_string, filename)
-
-
-
-
-
-
+
-    def __iter__(self):
-        for node in self.nodelist:
@@ -194 +189 @@
-            )
-
+def find_linebreaks(template_string):
+    for match in newline_re.finditer(template_string):
+        yield match.start()
-
-def tokenize(template_string, filename):
-    "Return a list of tokens from a given template_string"
-
-
-
+
-    token_tups = []
-    upto = 0
-    line = 1
+    #TODO:Py2.4 generator expression 
+    linebreaks = find_linebreaks(template_string)
+    next_linebreak = linebreaks.next()
+    try:
+        for match in tag_re.finditer(template_string):
+            start, end = match.span()
+            if start > upto:
+                token_tups.append( (template_string[upto:start], line) )
+                upto = start
+                
+                while next_linebreak <= upto:
+                    next_linebreak = linebreaks.next()
+                    line += 1
+            
+            token_tups.append( (template_string[start:end], line) )
+            upto = end
-    
-
-
-
-
-
-
-
+
+
-                line += 1
-
-
-
-
-
-
+
+
-    
-    last_bit = template_string[upto:]
-    if len(last_bit):
-
-
-
+
+
-    return [ create_token(tok, (filename, line)) for tok, line in token_tups]
-

django/branches/new-admin/django/views/admin/main.py

@@ -553 +553 @@
-        self.needs_add_label = field.rel and isinstance(field.rel, meta.ManyToOne) or isinstance(field.rel, meta.ManyToMany) and field.rel.to.admin
-        self.not_in_table = isinstance(self.field, meta.AutoField)
-Tru
+Fals
-        
-        classes = []