X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=engine%2Fprelude.py;h=29053551965a62486b1322ef25b856c2d33681d1;hb=fcebef2a30c4061ef8b7e302ad9e88554ed6803a;hp=2975cca168c44f8a450748e2c30e9321717966ce;hpb=b6440c94e0213514fee41d0906645f7657ba881f;p=unfold.git

diff --git a/engine/prelude.py b/engine/prelude.py
index 2975cca1..29053551 100644
--- a/engine/prelude.py
+++ b/engine/prelude.py
@@ -2,12 +2,14 @@ from types import StringTypes, ListType
 
 from django.template.loader import render_to_string
 
+debug=True
+
 class Prelude:
 
     """A class for collecting dependencies on js/css files or fragments"""
 
     keys=[ 'js_files','css_files','js_chunks', 'css_chunks' ]
-    def __init__ (self, js_files=[], css_files=[], js_chunks=[], css_chunks=[]):
+    def __init__ (self, js_files=None, css_files=None, js_chunks=None, css_chunks=None):
         # it's tempting to use sets but sets are not ordered..
         self.js_files  = Prelude._normalize(js_files)
         self.css_files = Prelude._normalize(css_files)
@@ -16,7 +18,8 @@ class Prelude:
 
     @staticmethod
     def _normalize (input):
-        if   isinstance (input, ListType):      return input
+        if not input:                           return []
+        elif isinstance (input, ListType):      return input
         elif isinstance (input, StringTypes):   return [ input ]
         else:                                   return list (input)
 
@@ -27,10 +30,19 @@ class Prelude:
         for i in Prelude._normalize (x):
             if i not in self.css_files: self.css_files.append(i)
     def add_js_chunks (self, x):
+        print 'add_js_chunks BEFORE',len(self.js_chunks)
         self.js_chunks += Prelude._normalize (x)
+        print 'add_js_chunks AFTER',len(self.js_chunks)
     def add_css_chunks (self, x):
         self.css_chunks += Prelude._normalize (x)
 
+    def inspect_string (self,msg):
+        result =  'Prelude.inspect %s (%s) with '%(msg,self)
+        result += ",".join( [ "%s->%s"%(k,len(getattr(self,k))) for k in ['js_files','js_chunks','css_files','css_chunks'] ] )
+        return result
+    def inspect (self,msg):
+        print self.inspect_string(msg)
+
     # first attempt was to use a simple dict like this
     #    env={}
     #    env['js_files']=  self.js_files
@@ -46,6 +58,8 @@ class Prelude:
     # 
     # so a much simpler and safer approach is for use to compute the html header directly
     def template_env (self): 
+        inspect = self.inspect ('template_env')
+        print inspect
         env={}
         env['js_files']=  self.js_files
         env['css_files']= self.css_files