KisssPM
  • Overview
  • Repository
  • Tickets
  • Statistics
  • Credits
  • Projects

Repository

Display an error when feedgenerator is not installed, but used

Parent commits : 9a3aeaf5b2b1d75139e5423ae17ee4764d6fd3a5,
Children commits : 534e2ae8892fd59234f6a12d51a3d088c976ccb1,

By Laurent Defert on 2015-02-21 14:25:38
Display an error when feedgenerator is not installed, but used

  • # TODO: remove this depency

Browse content
Difference with parent commit 9a3aeaf5b2b1d75139e5423ae17ee4764d6fd3a5
Files modified:
kissspm/pages/rss_page.py
--- 
+++ 
@@ -1,6 +1,9 @@
 import sys
 
-from feedgenerator.django.utils import feedgenerator
+try:
+    from feedgenerator.django.utils import feedgenerator
+except ImportError:
+    feedgenerator = None
 
 from .paginate_tmpl import PaginateTmpl
 
@@ -12,6 +15,10 @@
         if not self.conf.has_option('output', 'base_url') and self.rss_enabled:
             print >>sys.stderr, 'You must set the "base_url" option in order to enable RSS feeds, skeeping for now.'
             exit(1)
+
+        if feedgenerator is None and self.rss_enabled:
+            print >>sys.stderr, "Enabling rss feeds requires the Python module feedgenerator which could not be found. Please disable the option or install it."
+            sys.exit(1)
 
     def needs_build(self):
         return True

kissspm/tabs/repository/repository.py
--- 
+++ 
@@ -1,5 +1,10 @@
-from feedgenerator.django.utils.feedgenerator import rfc2822_date
 from cgi import escape
+
+try:
+    # TODO: remove this depency
+    from feedgenerator.django.utils.feedgenerator import rfc2822_date
+except ImportError:
+    rfc2822_date = None
 
 from ..tab import Tab
 from ...git import Git

Generated with KisssPM