Commits

Al...@bcc190cf-cafb-0310-a4f2-bffc1f526a37  committed ad02139

[soc2009/multidb] Merged up to trunk r11924.

  • Participants
  • Parent commits 818ed5f
  • Branches soc2009/multidb

Comments (0)

Files changed (3)

File django/template/loader.py

         module, attr = loader.rsplit('.', 1)
         try:
             mod = import_module(module)
-        except ImportError:
+        except ImportError, e:
             raise ImproperlyConfigured('Error importing template source loader %s: "%s"' % (loader, e))
         try:
             TemplateLoader = getattr(mod, attr)

File docs/topics/db/sql.txt

 
     It's tempting to write the above query as::
 
-        >>> query = 'SELECT * FROM myapp_person WHERE last_name = %s', % lname
+        >>> query = 'SELECT * FROM myapp_person WHERE last_name = %s' % lname
         >>> Person.objects.raw(query)
 
     **Don't.**
 
     Using the ``params`` list completely protects you from `SQL injection
-    attacks`__`, a common exploit where attackers inject arbitrary SQL into
+    attacks`__, a common exploit where attackers inject arbitrary SQL into
     your database. If you use string interpolation, sooner or later you'll
     fall victim to SQL injection. As long as you remember to always use the
     ``params`` list you'll be protected.

File tests/modeltests/raw_query/__init__.py

Empty file added.