diff options
| -rw-r--r-- | chimere_rss/feeds.py | 2 | ||||
| -rw-r--r-- | chimere_rss/urls.py | 9 | ||||
| -rw-r--r-- | example_project/urls.py | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/chimere_rss/feeds.py b/chimere_rss/feeds.py index 18a4259..454b6ef 100644 --- a/chimere_rss/feeds.py +++ b/chimere_rss/feeds.py @@ -26,7 +26,7 @@ from chimere.main.models import Category, SubCategory, Marker, Area from django.core.exceptions import ObjectDoesNotExist from django.contrib.gis.geos import * -from chimere import settings +from django.conf import settings class BaseFeed(Feed): """ diff --git a/chimere_rss/urls.py b/chimere_rss/urls.py index e5e9a24..915c1cc 100644 --- a/chimere_rss/urls.py +++ b/chimere_rss/urls.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2010 Pierre Clarenc <pierre.crc_AT_gmailDOTcom>, # Samuel Renard <renard.samuel_AT_gmailDOTcom>, +# Copyright (C) 2010-2012 # Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify @@ -22,9 +23,9 @@ from django.conf.urls.defaults import * -from chimere.rss.feeds import LatestPOIsByCategory, LatestPOIsBySubCategory, \ +from chimere_rss.feeds import LatestPOIsByCategory, LatestPOIsBySubCategory, \ LatestPOIs, LatestPOIsByZone, LatestPOIsByZoneID -from chimere.urls import EXTRA_NO_AREA as EXTRA + feeds = { 'category': LatestPOIsByCategory, @@ -35,8 +36,8 @@ feeds = { } urlpatterns = patterns('', - (EXTRA + r'rss/$', 'chimere.rss.views.rss'), - (EXTRA + r'rss/(?P<url>.*)/$', + (r'$', 'chimere_rss.views.rss'), + (r'/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), ) diff --git a/example_project/urls.py b/example_project/urls.py index 1f95694..6dc5e32 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -30,13 +30,14 @@ urlpatterns = patterns('django.views.static', ) urlpatterns += staticfiles_urlpatterns() +if 'chimere_rss' in settings.INSTALLED_APPS: + urlpatterns += patterns('', + url(r'^feeds/', include('chimere_rss.urls', namespace="chimere-rss")),) + urlpatterns += patterns('', (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), url(r'^', include('chimere.urls', namespace="chimere")), ) -if 'rss' in settings.INSTALLED_APPS: - urlpatterns += patterns('', - (r'^chimere/rss/', include('rss.urls')),) |