Changeset 881

Timestamp:

10/15/05 18:10:35 (3 years ago)

Author:

rjwittams

Message:

Merged to r880. Fixed lexing bug in DebugLexer?.

Files:

• django/branches/new-admin/django/conf/global_settings.py (modified) (1 diff)
• django/branches/new-admin/django/conf/project_template/settings/main.py (modified) (1 diff)
• django/branches/new-admin/django/core/db/backends/ado_mssql.py (copied) (copied from django/trunk/django/core/db/backends/ado_mssql.py)
• django/branches/new-admin/django/core/handlers/base.py (modified) (4 diffs)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (1 diff)
• django/branches/new-admin/django/core/template/__init__.py (modified) (6 diffs)
• django/branches/new-admin/django/utils/decorators.py (modified) (1 diff)
• django/branches/new-admin/docs/middleware.txt (modified) (1 diff)
• django/branches/new-admin/tests/othertests/templates.py (modified) (2 diffs)

django/branches/new-admin/django/conf/global_settings.py

@@ -46 +46 @@
-
-# Database connection info.
-or 'sqlite3
-
-
-
-
-
+'sqlite3' or 'ado_mssql
+             # Or path to database file if using sqlite3.
+             # Not used with sqlite3.
+         # Not used with sqlite3.
+ Not used with sqlite3.
+ Not used with sqlite3.
-
-# Host for sending e-mail.

django/branches/new-admin/django/conf/project_template/settings/main.py

@@ -11 +11 @@
-LANGUAGE_CODE = 'en-us'
-
-or 'sqlite3
+'sqlite3' or 'ado_mssql
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.

django/branches/new-admin/django/core/handlers/base.py

@@ -3 +3 @@
-class BaseHandler:
-    def __init__(self):
-
+self._exception_middleware = 
-
-    def load_middleware(self):
@@ -16 +16 @@
-        self._view_middleware = []
-        self._response_middleware = []
+        self._exception_middleware = []
-        for middleware_path in settings.MIDDLEWARE_CLASSES:
-            dot = middleware_path.rindex('.')
@@ -39 +40 @@
-            if hasattr(mw_instance, 'process_response'):
-                self._response_middleware.insert(0, mw_instance.process_response)
+            if hasattr(mw_instance, 'process_exception'):
+                self._exception_middleware.insert(0, mw_instance.process_exception)
-
-    def get_response(self, path, request):
@@ -62 +65 @@
-                    return response
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-            # Complain if the view returned None (a common error).

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

@@ -692 +692 @@
-
-        # Give the class a docstring -- its definition.
-
+
+
-
-        # Create the standard, module-level API helper functions such

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

@@ -191 +191 @@
-            self.contents[:20].replace('\n', '')
-            )
+            
+    def __repr__(self):
+        return '<%s token: "%s">' % (
+            {TOKEN_TEXT:'Text', TOKEN_VAR:'Var', TOKEN_BLOCK:'Block'}[self.token_type],
+            self.contents[:].replace('\n', '')
+            )
-
-class Lexer(object):
@@ -229 +235 @@
-        linebreaks = self.find_linebreaks(self.template_string)
-        next_linebreak = linebreaks.next()
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        next_linebreak = linebreaks.next()
-                        line += 1
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    next_linebreak = linebreaks.next()
-                    line += 1
-
-
-
+
+
+
+
-        last_bit = self.template_string[upto:]
-        if len(last_bit):
@@ -261 +275 @@
-        return token
-
-
+
-class Parser(object):
-    def __init__(self, tokens):
-        self.tokens = tokens
+        #print pformat(self.tokens)
-
-    def parse(self, parse_until=[]):
@@ -297 +312 @@
-                
-        if parse_until:
-
+, parse_until
-            
+        #print "-------------------------------"
+        #print pformat(nodelist)
+        #print "------------------------------"
-        return nodelist
-
@@ -319 +337 @@
-        raise TemplateSyntaxError, "Invalid block tag: %s" % (command)
-    
-
+, parse_until
-        raise TemplateSyntaxError, "Unclosed tags: %s " %  ', '.join(parse_until)
-        
@@ -359 +377 @@
-        raise TemplateSyntaxError, "Invalid block tag: '%s' %s" % (command, self.format_source(token.source))
-    
-
+, parse_until
-        (command, (file,line)) = self.command_stack.pop()
-        msg = "Unclosed tag '%s' starting at %s, line %d. Looking for one of: %s " % \

django/branches/new-admin/django/utils/decorators.py

@@ -17 +17 @@
-                if result is not None:
-                    return result
-
+
+
+
+
+
+
+
+
-            if hasattr(middleware, 'process_response'):
-                result = middleware.process_response(request, response)

django/branches/new-admin/docs/middleware.txt

@@ -169 +169 @@
-``HttpResponse``.
-
+process_exception
+-----------------
+
+Interface: ``process_exception(self, request, exception)``
+
+``request`` is an ``HttpRequest`` object. ``exception`` is an ``Exception``
+object raised by the view function.
+
+Django calls ``process_exception()`` when a view raises an exception.
+``process_exception()`` should return either ``None`` or an ``HttpResponse``
+object. If it returns an ``HttpResponse`` object, the response will be returned
+to the browser. Otherwise, default exception handling kicks in.
+
-Guidelines
-----------

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

@@ -218 +218 @@
-}
-
+def cutdown(name):
+    global TEMPLATE_TESTS
+    TEMPLATE_TESTS = dict([ (name, TEMPLATE_TESTS[name])]) 
+    print repr(TEMPLATE_TESTS[name])
+
+#cutdown('basic-syntax04') 
+
-# This replaces the standard template loader.
-def test_template_loader(template_name, template_dirs=None):
-    try:
-TEMPLATE_TESTS[template_name][0]
+( TEMPLATE_TESTS[template_name][0] , "test:%s" % template_name )
-    except KeyError:
-        raise template.TemplateDoesNotExist, template_name
-
-def run_tests(verbosity=0, standalone=False):
-
+
+
+
+
-    failed_tests = []
-    tests = TEMPLATE_TESTS.items()
@@ -249 +259 @@
-                print "Template test: %s -- FAILED. Expected %r, got %r" % (name, vals[2], output)
-            failed_tests.append(name)
-load_template_source = old_template_loader
+template_source_loaders = old_template_loaders
-
-    if failed_tests and not standalone: