Changeset 1372

Timestamp:

11/23/05 13:05:55 (3 years ago)

Author:

adrian

Message:

new-admin: Negligible syntax changes in django.core.template in preparation for merge to trunk

Files:

• django/branches/new-admin/django/core/template/defaulttags.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/__init__.py (modified) (22 diffs)
• django/branches/new-admin/django/core/template/loader.py (modified) (5 diffs)
• django/branches/new-admin/django/core/template/loaders/app_directories.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/loaders/eggs.py (modified) (1 diff)

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

@@ -193 +193 @@
-            grouper = resolve_variable_with_filters('var.%s' % self.expression, \
-                Context({'var': obj}))
-TODO: Is this a sensible way to determine equality? 
+ TODO: Is this a sensible way to determine equality?
-            if output and repr(output[-1]['grouper']) == repr(grouper):
-                output[-1]['list'].append(obj)

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

@@ -75 +75 @@
-ALLOWED_VARIABLE_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.'
-
-
+
+
-UNKNOWN_SOURCE="<unknown source>"
-
@@ -108 +109 @@
-    def __init__(self, name):
-        self.name = name
-
+
-    def reload(self):
-        raise NotImplementedException
@@ -119 +120 @@
-        super(StringOrigin, self).__init__(UNKNOWN_SOURCE)
-        self.source = source
-
+
-    def reload(self):
-        return self.source
@@ -128 +129 @@
-        if TEMPLATE_DEBUG and origin == None:
-            origin = StringOrigin(template_string)
-
+
+
-        self.nodelist = compile_string(template_string, origin)
-
+
-    def __iter__(self):
-        for node in self.nodelist:
@@ -141 +143 @@
-
-def compile_string(template_string, origin):
-     
+
-    lexer = lexer_factory(template_string, origin)
-    parser = parser_factory(lexer.tokenize())
@@ -187 +189 @@
-                return True
-        return False
-
+
-    def get(self, key, otherwise):
-        for dict in self.dicts:
@@ -205 +207 @@
-    def __str__(self):
-        return '<%s token: "%s...">' % (
-'Text', TOKEN_VAR:'Var', TOKEN_BLOCK:
+ 'Text', TOKEN_VAR: 'Var', TOKEN_BLOCK: 
-            self.contents[:20].replace('\n', '')
-            )
-
+
-    def __repr__(self):
-        return '<%s token: "%s">' % (
-'Text', TOKEN_VAR:'Var', TOKEN_BLOCK:
+ 'Text', TOKEN_VAR: 'Var', TOKEN_BLOCK: 
-            self.contents[:].replace('\n', '')
-            )
@@ -219 +221 @@
-        self.template_string = template_string
-        self.origin = origin
-
+
-    def tokenize(self):
-        "Return a list of tokens from a given template_string"
@@ -225 +227 @@
-        bits = filter(None, tag_re.split(self.template_string))
-        return map(self.create_token, bits)
-
+
-    def create_token(self,token_string):
-        "Convert the given token string into a new Token object and return it"
@@ -234 +236 @@
-        else:
-            token = Token(TOKEN_TEXT, token_string)
- 
+
-
-class DebugLexer(Lexer):
-    def __init__(self, template_string, origin):
-
+ 
-
-    def tokenize(self):
@@ -245 +247 @@
-        for match in tag_re.finditer(self.template_string):
-            start, end = match.span()
-       
- 
+
+
-                upto = start
- 
+
-            upto = end
-        last_bit = self.template_string[upto:]
-        if last_bit:
- ) 
- 
+)
+
-
-    def create_token(self, token_string, source):
@@ -289 +291 @@
-                    compile_func = registered_tags[command]
-                except KeyError:
- 
+
-                try:
-                    compiled_result = compile_func(self, token)
@@ -306 +308 @@
-    def create_nodelist(self):
-        return NodeList()
-
+
-    def extend_nodelist(self, nodelist, node, token):
-        nodelist.append(node)
@@ -312 +314 @@
-    def enter_command(self, command, token):
-        pass
-
+
-    def exit_command(self):
-        pass
@@ -321 +323 @@
-    def empty_variable(self, token):
-        raise self.error( token, "Empty variable tag")
-
+
-    def empty_block_tag(self, token):
-        raise self.error( token, "Empty block tag")
-
+
-    def invalid_block_tag(self, token, command):
-        raise self.error( token, "Invalid block tag: '%s'" % command)
-
+
-    def unclosed_block_tag(self, parse_until):
-        raise self.error(None, "Unclosed tags: %s " %  ', '.join(parse_until))
@@ -333 +335 @@
-    def compile_function_error(self, token, e):
-        pass
-
+
-    def next_token(self):
-        return self.tokens.pop(0)
@@ -342 +344 @@
-    def delete_first_token(self):
-        del self.tokens[0]
-
+
-class DebugParser(Parser):
-    def __init__(self, lexer):
@@ -350 +352 @@
-    def enter_command(self, command, token):
-        self.command_stack.append( (command, token.source) )
-
+
-    def exit_command(self):
-        self.command_stack.pop()
@@ -371 +373 @@
-        node.source = token.source
-        super(DebugParser, self).extend_nodelist(nodelist, node, token)
-
+
-    def unclosed_block_tag(self, parse_until):
-        (command, source) = self.command_stack.pop()
-
-
+
-        raise self.source_error( source, msg)
-
@@ -662 +663 @@
-    'arg_sep': re.escape(FILTER_ARGUMENT_SEPARATOR),
-    'i18n_open' : re.escape("_("),
-                         
+
-  }
-
+
-filter_raw_string = filter_raw_string.replace("\n", "").replace(" ", "")
-filter_re = re.compile(filter_raw_string)
-
-class RegexFilterParser(object):
-
-
+
-    def __init__(self, token):
-        matches = filter_re.finditer(token)
@@ -828 +828 @@
-        except Exception:
-            from sys import exc_info
- 'Caught exception whilst rendering' 
+'Caught an exception while rendering.'
-            wrapped.source = node.source
-            wrapped.exc_info = exc_info()
@@ -859 +859 @@
-        else:
-            return output
-
+
-    def render(self, context):
-        output = resolve_variable_with_filters(self.var_string, context)

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

@@ -8 +8 @@
-# name is the template name.
-# dirs is an optional list of directories to search instead of TEMPLATE_DIRS.
+#
-# The loader should return a tuple of (template_source, path). The path returned
-will be shown to the user for debugging purposes, so it should identify where the template 
-was loaded from.  
+might be shown to the user for debugging purposes, so it should identify where
+the template was loaded from.
-#
-# Each loader should have an "is_usable" attribute set. This is a boolean that
@@ -46 +47 @@
-        super(LoaderOrigin, self).__init__(display_name)
-        self.loader, self.loadname, self.dirs = loader, name, dirs
-
+
-    def reload(self):
-        return self.loader(self.loadname, self.dirs)[0]
@@ -90 +91 @@
-    context. The template_name may be a string to load a single template using
-    get_template, or it may be a tuple to use select_template to find one of
- Returns a string. 
+Returns a string.
-    """
-    dictionary = dictionary or {}
@@ -100 +101 @@
-        context_instance.update(dictionary)
-    else:
- 
+
-    return t.render(context_instance)
-
@@ -186 +187 @@
-        try:
-            t = get_template(template_path)
-nodelist = t.nodelis
+template = 
-        except Exception, e:
-            if TEMPLATE_DEBUG:
-                raise
-nodelist
-
-
-nodelist
-nodelist
+template
+
+
+template
+template
-        else:
-            return ''
-
-class IncludeNode(Node):
-path_var
-path_var = template_path_var
+name
+name = template_name
-
-    def render(self, context):
-         try:
-path = resolve_variable(self.template_path_var
-path
+name = resolve_variable(self.template_name
+name
-             return t.render(context)
-         except Exception, e:

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

@@ -24 +24 @@
-    if os.path.isdir(template_dir):
-        app_template_dirs.append(template_dir)
-
+
-# It won't change, so convert it to a tuple to save memory.
-app_template_dirs = tuple(app_template_dirs)

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

@@ -19 +19 @@
-        for app in INSTALLED_APPS:
-            try:
- 
+
-            except:
-                pass