Navigation

syndication

Timestamp:

03/23/08 12:18:58 (10 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7280-7353 via svnmerge from trunk.

Files:

django/branches/gis
- Property svnmerge-integrated changed from /django/trunk:1-7278 to /django/trunk:1-7353

r7103	r7354
4	4	from django.utils import feedgenerator
5	5	from django.utils.encoding import smart_unicode, iri_to_uri
6		from django.conf import settings
	6	from django.conf import settings
	7	from django.template import RequestContext
7	8
8	9	def add_domain(domain, url):
…	…
56	57	return attr
57	58
	59	def get_object(self, bits):
	60	return None
	61
58	62	def get_feed(self, url=None):
59	63	"""
…	…
62	66	"""
63	67	if url:
64		try:
65		obj = self.get_object(url.split('/'))
66		except (AttributeError, ObjectDoesNotExist):
67		raise FeedDoesNotExist
	68	bits = url.split('/')
68	69	else:
69		obj = None
	70	bits = []
	71
	72	try:
	73	obj = self.get_object(bits)
	74	except ObjectDoesNotExist:
	75	raise FeedDoesNotExist
70	76
71	77	if Site._meta.installed:
…	…
120	126	author_email = author_link = None
121	127	feed.add_item(
122		title = title_tmp.render(~~Context(~~{'obj': item, 'site': current_site})),
	128	title = title_tmp.render(RequestContext(self.request, {'obj': item, 'site': current_site})),
123	129	link = link,
124		description = description_tmp.render(~~Context(~~{'obj': item, 'site': current_site})),
	130	description = description_tmp.render(RequestContext(self.request, {'obj': item, 'site': current_site})),
125	131	unique_id = self.__get_dynamic_attr('item_guid', item, link),
126	132	enclosure = enc,