merge

.hgtags

 e601c995d930d016802e0b9aa95a5b4625aa74e4 e601c995d930
 254df3c3e18df7aca19e818e6907afaa045f8931 cubicweb-blog-version-1_5_0
 0bc1f3ac26ca77221ab2a3dedb525341d2ab55b9 cubicweb-blog-debian-version-1_5_0-1
+de2fb8748325126a71d2e5fb7281d7d369671523 cubicweb-blog-version-1_5_1

__pkginfo__.py

@@ -4,7 +4,7 @@
 distname = "cubicweb-blog"
 modname = distname.split('-', 1)[1]
 
-numversion = (1, 5, 0)
+numversion = (1, 5, 1)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'

debian/changelog

+cubicweb-blog (1.5.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Katia Saurfelt <katia.saurfelt@logilab.fr>  Wed, 22 Apr 2009 10:02:35 +0200
+
 cubicweb-blog (1.5.0-1) unstable; urgency=low
 
@@ -1,7 +7,6 @@
 cubicweb-blog (1.5.0-1) unstable; urgency=low
 
-  * hide the blogs box when it's empty
-  * blog entry to multiple blogs
+  * new upstream release
 
  -- Graziella Toutoungis <graziella.toutoungis@logilab.fr>  Mon, 30 Mar 2009 14:33:03 +0100
 

entities.py

@@ -20,9 +20,9 @@
     def dc_title(self):
         return self.title
 
-    def dc_description(self):
-        return self.printable_value('content')
-    
+    def dc_description(self, format='text/plain'):
+        return self.printable_value('content', format=format)
+
     ## calendar interfaces ####################################################
     @property
     def start(self):
@@ -31,7 +31,7 @@
     @property
     def stop(self):
         return self.creation_date
-    
+
     def matching_dates(self, begin, end):
         """calendar views interface"""
         mydate = self.creation_date
@@ -50,8 +50,8 @@
 
     def isioc_container(self):
         rset = self.related('entry_of')
-        entity = rset.get_entity(0, 0)                  
+        entity = rset.get_entity(0, 0)
         return entity
 
     def isioc_type(self):
         return 'BlogPost'
@@ -54,6 +54,6 @@
         return entity
 
     def isioc_type(self):
         return 'BlogPost'
-        
+
     def isioc_replies(self):
@@ -59,5 +59,5 @@
     def isioc_replies(self):
-        return []        
+        return []
 
     def isioc_topics(self):
         return []
@@ -61,9 +61,9 @@
 
     def isioc_topics(self):
         return []
-        
+
 class Blog(AnyEntity):
     """customized class for Blog entities"""
 
     id = 'Blog'
     __rtags__ = {'entry_of': 'create'}
@@ -65,10 +65,10 @@
 class Blog(AnyEntity):
     """customized class for Blog entities"""
 
     id = 'Blog'
     __rtags__ = {'entry_of': 'create'}
-    __implements__ = AnyEntity.__implements__ + (ISiocContainer,) 
-    
+    __implements__ = AnyEntity.__implements__ + (ISiocContainer,)
+
 
     def rss_feed_url(self):
         if self.rss_url:
@@ -82,5 +82,5 @@
 
     def isioc_items(self):
         return self.reverse_entry_of
-       
-   
+
+