Merged to r880. Fixed lexing bug in DebugLexer.

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@881 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/conf/global_settings.py

@@ -45,12 +45,12 @@ SERVER_EMAIL = 'root@localhost'
 SEND_BROKEN_LINK_EMAILS = False
 
 # Database connection info.
-DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', or 'sqlite3'.
-DATABASE_NAME = ''
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''             # Set to empty string for localhost.
-DATABASE_PORT = ''             # Set to empty string for default.
+DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_USER = ''             # Not used with sqlite3.
+DATABASE_PASSWORD = ''         # Not used with sqlite3.
+DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'

django/conf/project_template/settings/main.py

@@ -10,7 +10,7 @@ MANAGERS = ADMINS
 
 LANGUAGE_CODE = 'en-us'
 
-DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', or 'sqlite3'.
+DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.

django/core/db/backends/ado_mssql.py

@@ -0,0 +1,153 @@
+"""
+ADO MSSQL database backend for Django.
+
+Requires adodbapi 2.0.1: http://adodbapi.sourceforge.net/
+"""
+
+from django.core.db import base
+from django.core.db.dicthelpers import *
+import adodbapi as Database
+import datetime
+try:
+    import mx
+except ImportError:
+    mx = None
+
+DatabaseError = Database.DatabaseError
+
+# We need to use a special Cursor class because adodbapi expects question-mark
+# param style, but Django expects "%s". This cursor converts question marks to
+# format-string style.
+class Cursor(Database.Cursor):
+    def executeHelper(self, operation, isStoredProcedureCall, parameters=None):
+        if parameters is not None and "%s" in operation:
+            operation = operation.replace("%s", "?")
+        Database.Cursor.executeHelper(self, operation, isStoredProcedureCall, parameters)
+
+class Connection(Database.Connection):
+    def cursor(self):
+        return Cursor(self)
+Database.Connection = Connection
+
+origCVtoP = Database.convertVariantToPython
+def variantToPython(variant, adType):
+    if type(variant) == bool and adType == 11:
+        return variant  # bool not 1/0
+    res = origCVtoP(variant, adType)
+    if mx is not None and type(res) == mx.DateTime.mxDateTime.DateTimeType:
+        # Convert ms.DateTime objects to Python datetime.datetime objects.
+        tv = list(res.tuple()[:7])
+        tv[-2] = int(tv[-2])
+        return datetime.datetime(*tuple(tv))
+    if type(res) == float and str(res)[-2:] == ".0":
+        return int(res) # If float but int, then int.
+    return res
+Database.convertVariantToPython = variantToPython
+
+class DatabaseWrapper:
+    def __init__(self):
+        self.connection = None
+        self.queries = []
+
+    def cursor(self):
+        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG
+        if self.connection is None:
+            if DATABASE_NAME == '' or DATABASE_USER == '':
+                from django.core.exceptions import ImproperlyConfigured
+                raise ImproperlyConfigured, "You need to specify both DATABASE_NAME and DATABASE_USER in your Django settings file."
+            if not DATABASE_HOST:
+                DATABASE_HOST = "127.0.0.1"
+            # TODO: Handle DATABASE_PORT.
+            conn_string = "PROVIDER=SQLOLEDB;DATA SOURCE=%s;UID=%s;PWD=%s;DATABASE=%s" % (DATABASE_HOST, DATABASE_USER, DATABASE_PASSWORD, DATABASE_NAME)
+            self.connection = Database.connect(conn_string)
+        cursor = self.connection.cursor()
+        if DEBUG:
+            return base.CursorDebugWrapper(cursor, self)
+        return cursor
+
+    def commit(self):
+        return self.connection.commit()
+
+    def rollback(self):
+        if self.connection:
+            return self.connection.rollback()
+
+    def close(self):
+        if self.connection is not None:
+            self.connection.close()
+            self.connection = None
+
+def get_last_insert_id(cursor, table_name, pk_name):
+    cursor.execute("SELECT %s FROM %s WHERE %s = @@IDENTITY" % (pk_name, table_name, pk_name))
+    return cursor.fetchone()[0]
+
+def get_date_extract_sql(lookup_type, table_name):
+    # lookup_type is 'year', 'month', 'day'
+    return "DATEPART(%s, %s)" % (lookup_type, table_name)
+
+def get_date_trunc_sql(lookup_type, field_name):
+    # lookup_type is 'year', 'month', 'day'
+    if lookup_type=='year':
+        return "Convert(datetime, Convert(varchar, DATEPART(year, %s)) + '/01/01')" % field_name
+    if lookup_type=='month':
+        return "Convert(datetime, Convert(varchar, DATEPART(year, %s)) + '/' + Convert(varchar, DATEPART(month, %s)) + '/01')" % (field_name, field_name)
+    if lookup_type=='day':
+        return "Convert(datetime, Convert(varchar(12), %s))" % field_name
+
+def get_limit_offset_sql(limit, offset=None):
+    # TODO: This is a guess. Make sure this is correct.
+    sql = "LIMIT %s" % limit
+    if offset and offset != 0:
+        sql += " OFFSET %s" % offset
+    return sql
+
+def get_random_function_sql():
+    # TODO: This is a guess. Make sure this is correct.
+    return "RANDOM()"
+
+def get_relations(cursor, table_name):
+    raise NotImplementedError
+
+OPERATOR_MAPPING = {
+    'exact': '=',
+    'iexact': 'LIKE',
+    'contains': 'LIKE',
+    'icontains': 'LIKE',
+    'ne': '!=',
+    'gt': '>',
+    'gte': '>=',
+    'lt': '<',
+    'lte': '<=',
+    'startswith': 'LIKE',
+    'endswith': 'LIKE',
+    'istartswith': 'LIKE',
+    'iendswith': 'LIKE',
+}
+
+DATA_TYPES = {
+    'AutoField':         'int IDENTITY (1, 1)',
+    'BooleanField':      'bit',
+    'CharField':         'varchar(%(maxlength)s)',
+    'CommaSeparatedIntegerField': 'varchar(%(maxlength)s)',
+    'DateField':         'smalldatetime',
+    'DateTimeField':     'smalldatetime',
+    'EmailField':        'varchar(75)',
+    'FileField':         'varchar(100)',
+    'FilePathField':     'varchar(100)',
+    'FloatField':        'numeric(%(max_digits)s, %(decimal_places)s)',
+    'ImageField':        'varchar(100)',
+    'IntegerField':      'int',
+    'IPAddressField':    'char(15)',
+    'ManyToManyField':   None,
+    'NullBooleanField':  'bit',
+    'OneToOneField':     'int',
+    'PhoneNumberField':  'varchar(20)',
+    'PositiveIntegerField': 'int CONSTRAINT [CK_int_pos_%(name)s] CHECK ([%(name)s] > 0)',
+    'PositiveSmallIntegerField': 'smallint CONSTRAINT [CK_smallint_pos_%(name)s] CHECK ([%(name)s] > 0)',
+    'SlugField':         'varchar(50)',
+    'SmallIntegerField': 'smallint',
+    'TextField':         'text',
+    'TimeField':         'time',
+    'URLField':          'varchar(200)',
+    'USStateField':      'varchar(2)',
+}

django/core/handlers/base.py

@@ -2,7 +2,7 @@ from django.utils import httpwrappers
 
 class BaseHandler:
     def __init__(self):
-        self._request_middleware = self._view_middleware = self._response_middleware = None
+        self._request_middleware = self._view_middleware = self._response_middleware = self._exception_middleware = None
 
     def load_middleware(self):
         """
@@ -15,6 +15,7 @@ class BaseHandler:
         self._request_middleware = []
         self._view_middleware = []
         self._response_middleware = []
+        self._exception_middleware = []
         for middleware_path in settings.MIDDLEWARE_CLASSES:
             dot = middleware_path.rindex('.')
             mw_module, mw_classname = middleware_path[:dot], middleware_path[dot+1:]
@@ -38,6 +39,8 @@ class BaseHandler:
                 self._view_middleware.append(mw_instance.process_view)
             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):
         "Returns an HttpResponse object for the given HttpRequest"
@@ -61,7 +64,17 @@ class BaseHandler:
                 if response:
                     return response
 
-            response = callback(request, **param_dict)
+            try:
+                response = callback(request, **param_dict)
+            except Exception, e:
+                # If the view raised an exception, run it through exception
+                # middleware, and if the exception middleware returns a
+                # response, use that. Otherwise, reraise the exception.
+                for middleware_method in self._exception_middleware:
+                    response = middleware_method(request, e)
+                    if response:
+                        return response
+                raise e
 
             # Complain if the view returned None (a common error).
             if response is None:

django/core/meta/__init__.py

@@ -691,7 +691,8 @@ class ModelBase(type):
         new_class = type.__new__(cls, name, bases, attrs)
 
         # Give the class a docstring -- its definition.
-        new_class.__doc__ = "%s.%s(%s)" % (opts.module_name, name, ", ".join([f.name for f in opts.fields]))
+        if new_class.__doc__ is None:
+            new_class.__doc__ = "%s.%s(%s)" % (opts.module_name, name, ", ".join([f.name for f in opts.fields]))
 
         # Create the standard, module-level API helper functions such
         # as get_object() and get_list().

django/core/template/__init__.py

@@ -191,6 +191,12 @@ class Token:
             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):
     def __init__(self, template_string, filename):
         self.template_string = template_string
@@ -228,25 +234,33 @@ class DebugLexer(Lexer):
         #TODO:Py2.4 generator expression 
         linebreaks = self.find_linebreaks(self.template_string)
         next_linebreak = linebreaks.next()
-        try:
-            for match in tag_re.finditer(self.template_string):
-                start, end = match.span()
-                if start > upto:
-                    token_tups.append( (self.template_string[upto:start], line) )
-                    upto = start
         
-                    while next_linebreak <= upto:
-                        next_linebreak = linebreaks.next()
-                        line += 1
 
-                token_tups.append( (self.template_string[start:end], line) )
-                upto = end
+        for match in tag_re.finditer(self.template_string):
+            start, end = match.span()
+            #print "%d:%d --- %s " % (start, end, self.template_string[start:end] )
+            if start > upto:       
+                token_tups.append( (self.template_string[upto:start], line) )
+                upto = start
                 
                 while next_linebreak <= upto:
+                    try: 
+                        next_linebreak = linebreaks.next()
+                        line += 1
+                    except StopIteration:
+                        next_linebreak = len(self.template_string)
+                        break
+            
+            token_tups.append( (self.template_string[start:end], line) )
+            upto = end
+    
+            while next_linebreak <= upto:
+                try: 
                     next_linebreak = linebreaks.next()
                     line += 1
-        except StopIteration:
-            pass
+                except StopIteration:
+                    next_linebreak = len(self.template_string)
+                    break
 
         last_bit = self.template_string[upto:]
         if len(last_bit):
@@ -260,10 +274,11 @@ class DebugLexer(Lexer):
         token.source = source
         return token
 
-
+from pprint import pformat
 class Parser(object):
     def __init__(self, tokens):
         self.tokens = tokens
+        #print pformat(self.tokens)
 
     def parse(self, parse_until=[]):
         nodelist = NodeList()
@@ -296,8 +311,11 @@ class Parser(object):
                 self.exit_command();
                 
         if parse_until:
-            self.unclosed_block_tag(token)
+            self.unclosed_block_tag(token, parse_until)
             
+        #print "-------------------------------"
+        #print pformat(nodelist)
+        #print "------------------------------"
         return nodelist
 
     def extend_nodelist(self, nodelist, node, token):
@@ -318,7 +336,7 @@ class Parser(object):
     def invalid_block_tag(self, token, command):
         raise TemplateSyntaxError, "Invalid block tag: %s" % (command)
     
-    def unclosed_block_tag(self, token):
+    def unclosed_block_tag(self, token, parse_until):
         raise TemplateSyntaxError, "Unclosed tags: %s " %  ', '.join(parse_until)
         
     def next_token(self):
@@ -358,7 +376,7 @@ class DebugParser(Parser):
     def invalid_block_tag(self, token, command):
         raise TemplateSyntaxError, "Invalid block tag: '%s' %s" % (command, self.format_source(token.source))
     
-    def unclosed_block_tag(self, token):
+    def unclosed_block_tag(self, token, parse_until):
         (command, (file,line)) = self.command_stack.pop()
         msg = "Unclosed tag '%s' starting at %s, line %d. Looking for one of: %s " % \
               (command, file, line, ', '.join(parse_until) ) 

django/utils/decorators.py

@@ -16,7 +16,14 @@ def decorator_from_middleware(middleware_class):
                 result = middleware.process_view(request, view_func, **kwargs)
                 if result is not None:
                     return result
-            response = view_func(request, *args, **kwargs)
+            try:
+                response = view_func(request, *args, **kwargs)
+            except Exception, e:
+                if hasattr(middleware, 'process_exception'):
+                    result = middleware.process_exception(request, e)
+                    if result is not None:
+                        return result
+                raise e
             if hasattr(middleware, 'process_response'):
                 result = middleware.process_response(request, response)
                 if result is not None:

docs/middleware.txt

@@ -168,6 +168,19 @@ object returned by a Django view.
 the given ``response``, or it could create and return a brand-new
 ``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
 ----------
 

tests/othertests/templates.py

@@ -217,15 +217,25 @@ TEMPLATE_TESTS = {
     'exception04': ("{% extends 'inheritance17' %}{% block first %}{% echo 400 %}5678{% endblock %}", {}, template.TemplateSyntaxError),
 }
 
+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:
-        return TEMPLATE_TESTS[template_name][0]
+        return ( TEMPLATE_TESTS[template_name][0] , "test:%s" % template_name )
     except KeyError:
         raise template.TemplateDoesNotExist, template_name
 
 def run_tests(verbosity=0, standalone=False):
-    loader.load_template_source, old_template_loader = test_template_loader, loader.load_template_source
+    # Register our custom template loader.
+    old_template_loaders = loader.template_source_loaders
+    loader.template_source_loaders = [test_template_loader]
+    
     failed_tests = []
     tests = TEMPLATE_TESTS.items()
     tests.sort()
@@ -248,7 +258,7 @@ def run_tests(verbosity=0, standalone=False):
             if verbosity:
                 print "Template test: %s -- FAILED. Expected %r, got %r" % (name, vals[2], output)
             failed_tests.append(name)
-    loader.load_template_source = old_template_loader
+    loader.template_source_loaders = old_template_loaders
 
     if failed_tests and not standalone:
         msg = "Template tests %s failed." % failed_tests