Bug#495186: [PATCH] django-djblets -- setup.py improvements / fallback to system feedparser

[Chris Lamb <chris@chris-lamb.co.uk>]

Hi Christian,

I am packaging the djblets utilities for the Debian GNU/Linux distribution
as a prerequisite for packaging the Review Board tool.

Whilst preparing the uploads, I created two patches which I am submittinng
to you with the aim that there is no delta between upstream and the Debian
packages. I therefore hope you can apply them.

In addition, whilst cleaning this patches for submission I noticed that the
licence for setup.py was GPL2+. Was this an error? The rest of the files are
licensed under the BSD.

Both should apply cleanly to the latest SVN HEAD.


Regards,

-- 
Chris Lamb, UK                                       chris@chris-lamb.co.uk
                                                            GPG: 0x634F9A20

 Install all packages and associated datafiles in setup.py.

 This is not needed for Review Board, but it is useful when djblets is
 installed seperately.

      -- Chris Lamb <chris@chris-lamb.co.uk>  Sat, 16 Aug 2008 06:30:10 +0100

diff -urNad python-django-djblets.orig/setup.py python-django-djblets/setup.py
--- python-django-djblets.orig/setup.py	2008-08-16 03:14:09.000000000 +0100
+++ python-django-djblets/setup.py	2008-08-16 03:18:04.000000000 +0100
@@ -23,5 +23,23 @@
 
 setup(name='djblets',
       version='0.1',
-      packages=['djblets', 'djblets.auth', 'djblets.util'])
+      packages=[
+        'djblets',
+        'djblets.auth',
+        'djblets.util',
+        'djblets.util.templatetags',
+        'djblets.datagrid',
+        'djblets.datagrid.templatetags',
+        'djblets.feedview',
+        'djblets.feedview.templatetags',
+        'djblets.logging',
+        'djblets.siteconfig',
+        'djblets.webapi'
+      ],
+      package_data={
+        'djblets.util': ['templates/deco/*.html'],
+        'djblets.siteconfig': ['templates/siteconfig/*.html'],
+        'djblets.feedview': ['templates/feedview/*.html'],
+        'djblets.datagrid': ['templates/datagrid/*.html'],
+      })
 

 Fallback to system feedparser package.

 This allows distributors to remove the embedded copy of the Feedparser
 library and install a system one.

      -- Chris Lamb <chris@chris-lamb.co.uk>  Sat, 16 Aug 2008 06:30:10 +0100

diff -urNad python-django-djblets.orig/djblets/feedview/views.py python-django-djblets/djblets/feedview/views.py
--- python-django-djblets.orig/djblets/feedview/views.py	2008-08-16 03:58:48.000000000 +0100
+++ python-django-djblets/djblets/feedview/views.py	2008-08-16 03:59:34.000000000 +0100
@@ -6,7 +6,11 @@
 from django.template.context import RequestContext
 from django.template.loader import render_to_string
 
-from djblets.feedview import feedparser
+try:
+    from djblets.feedview import feedparser
+except ImportError:
+    import feedparser
+
 from djblets.util.misc import cache_memoize

Attachment: signature.asc
Description: PGP signature