Changeset 906

Timestamp:

10/17/05 09:26:41 (3 years ago)

Author:

rjwittams

Message:

Cleanups of old debug bits. Fully clean DebugLexer?.
Reverted some testing changes.

Files:

• django/branches/new-admin/django/core/management.py (modified) (1 diff)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/__init__.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/loader.py (modified) (1 diff)
• django/branches/new-admin/tests/othertests/templates.py (modified) (1 diff)

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

@@ -641 +641 @@
-        except KeyboardInterrupt:
-            sys.exit(0)
-#
-#
-
+
+
+#
-runserver.args = '[optional port number, or ipaddr:port]'
-

django/branches/new-admin/django/core/meta/__init__.py

@@ -1604 +1604 @@
-
-def manipulator_save(opts, klass, add, change, self, new_data):
+    # TODO: big cleanup when core fields go -> use recursive manipulators. 
-    from django.utils.datastructures import DotExpandedDict
-    params = {}

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

@@ -225 +225 @@
-        for match in newline_re.finditer(template_string):
-            yield match.start()
+        yield len(template_string) + 1
-
-    def tokenize(self):
-        "Return a list of tokens from a given template_string"
-
-
-
-
-
-
-
-
-
+
+
+
-        for match in tag_re.finditer(self.template_string):
+            while next_linebreak <= upto:
+                line, next_linebreak = lines.next()    
-            start, end = match.span()
-            if start > upto:       
-                token_tups.append( (self.template_string[upto:start], line) )
-                upto = start
-                
-                while next_linebreak <= upto:
-
-
-
-
-
-
+
-            token_tups.append( (self.template_string[start:end], line) )
-            upto = end
-    
-            while next_linebreak <= upto:
-                try: 
-                    next_linebreak = linebreaks.next()
-                    line += 1
-                except StopIteration:
-                    break
-
-        last_bit = self.template_string[upto:]
-en(last_bit)
+ast_bit
-           token_tups.append( (last_bit, line) )
-        
-        return [ self.create_token(tok, (self.filename, line)) for tok, line in token_tups]
-
-
-    def create_token(self, token_string, source):

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

@@ -189 +189 @@
-             template_path = resolve_variable(self.template_path_var, context)
-             print "IncludeNode rendering %s" % template_path
-template_loader.
+
-             return t.render(context)
-         except Exception, e:

django/branches/new-admin/tests/othertests/templates.py

@@ -216 +216 @@
-    # Raise exception for custom tags used in child with {% load %} tag in parent, not in child
-    'exception04': ("{% extends 'inheritance17' %}{% block first %}{% echo 400 %}5678{% endblock %}", {}, template.TemplateSyntaxError),
+
+    'multiline01': ("""
+                    Hello,
+                    boys.
+                    How 
+                    are 
+                    you
+                    gentlemen. 
+                    """, 
+                    {}, 
+                    """
+                    Hello,
+                    boys.
+                    How 
+                    are 
+                    you
+                    gentlemen. 
+                    """  ), 
-}
-