[Z3lab-checkins] r3560 - in cpsskins/branches/paris-sprint-2006: . doc

[jmorliaguet]

Author: jmorliaguet
Date: Thu Jun 29 18:58:29 2006
New Revision: 3560

Modified:
   cpsskins/branches/paris-sprint-2006/doc/theme-structure.txt
   cpsskins/branches/paris-sprint-2006/thememanager.py

Log:

- fixes, the isDefault() method was broken

- do not default to empty values when function parameters are required



Modified: cpsskins/branches/paris-sprint-2006/doc/theme-structure.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/doc/theme-structure.txt (original)
+++ cpsskins/branches/paris-sprint-2006/doc/theme-structure.txt Thu Jun 29 
18:58:29 2006
@@ -115,7 +115,7 @@
 
     >>> page2 = ThemePage('Page 2')
     >>> tmutil.addPage(theme2, page2)
-    'ThemePage-2'
+    u'ThemePage-2'
 
     >>> inspect()
     - Theme (default: True)

Modified: cpsskins/branches/paris-sprint-2006/thememanager.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/thememanager.py (original)
+++ cpsskins/branches/paris-sprint-2006/thememanager.py Thu Jun 29 18:58:29 2006
@@ -223,7 +223,7 @@
     # Themes and pages
     ###################################################################
 
-    def addTheme(self, theme=None, name=u''):
+    def addTheme(self, theme, name=u''):
         if not ITheme.providedBy(theme):
             raise("Must specify a theme.")
 
@@ -231,7 +231,7 @@
         self[name] = theme
         return name
 
-    def addPage(self, theme=None, page=None, name=u''):
+    def addPage(self, theme, page, name=u''):
         if not IThemePage.providedBy(page):
             raise("Must specify a theme page.")
 
@@ -245,7 +245,7 @@
     def getPages(self, theme):
         return [page for name, page in theme.getUtilitiesFor(IThemePage)]
 
-    def deleteTheme(self, name=u''):
+    def deleteTheme(self, name):
         for k, v in self.getUtilitiesFor(ITheme):
             if k == name:
                 del self[getName(v)]
@@ -257,13 +257,13 @@
         for k, v in self.getUtilitiesFor(ITheme):
             del self[getName(v)]
 
-    def getThemeByName(self, name=u''):
+    def getThemeByName(self, name):
         for k, v in self.getUtilitiesFor(ITheme):
             if k == name:
                 return v
         return None
 
-    def getPageByName(self, name=u''):
+    def getPageByName(self, name):
         theme_name, page_name = name.split(u':')
         theme = self.getThemeByName(theme_name)
         if theme is None:
@@ -273,18 +273,18 @@
                 return v
         return None
 
-    def isDefault(self, object=None):
+    def isDefault(self, object):
         relations = self.getRelationStorage()
         res = relations.search(predicate=isDefault, first=object)
-        return res is not []
+        return bool(res)
 
-    def setAsDefault(self, object=None):
+    def setAsDefault(self, object):
         relations = self.getRelationStorage()
         relations.add(MonadicRelation(isDefault, object))
         defaults = []
         for o in object.getSiblings():
             defaults.extend(relations.search(predicate=isDefault, first=o))
-            relations.remove(defaults)
+        relations.remove(defaults)
 
     def getDefaultTheme(self):
         for theme in self.getThemes():
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins