Changeset 7565

Timestamp:

05/29/08 08:11:23 (3 months ago)

Author:

russellm

Message:

Fixed #6430 -- Corrected the loading of templates from eggs, which was broken by the unicode merge. Thanks for the excellent report and patch, Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>.

Files:

• django/trunk/AUTHORS (modified) (2 diffs)
• django/trunk/django/template/loaders/eggs.py (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/loaders.py (added)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -79 +79 @@
-    btoll@bestweb.net
-    Jonathan Buchanan <jonathan.buchanan@gmail.com>
-Can Burak Çilingir <canburak@cs.bilgi.edu.tr
+Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com
-    Trevor Caira <trevor@caira.com>
-    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
@@ -93 +93 @@
-    Bryan Chow <bryan at verdjn dot com>
-    Michal Chruszcz <troll@pld-linux.org>
+    Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
-    Ian Clelland <clelland@gmail.com>
-    Russell Cloran <russell@rucus.net>

django/trunk/django/template/loaders/eggs.py

@@ -19 +19 @@
-        for app in settings.INSTALLED_APPS:
-            try:
-, 'egg:%s:%s ' % (app, pkg_name)).decode(settings.FILE_CHARSET
+.decode(settings.FILE_CHARSET), 'egg:%s:%s' % (app, pkg_name)
-            except:
-                pass

django/trunk/tests/regressiontests/templates/tests.py

@@ -20 +20 @@
-from unicode import unicode_tests
-from context import context_tests
+
+from loaders import *
+
-import filters
-
-# Some other tests we would like to run
-__test__ = {
-    
-    'context': context_tests,
+
+'context': context_tests
-}
-