mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

merged to trunk r1143

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Robert Wittams 2005-11-10 00:06:32 +00:00
commit a4961a9ff5
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/cache.py
View File

@ -336,7 +336,7 @@ class _FileCache(_SimpleCache):
return os.path.exists(self._key_to_file(key)) return os.path.exists(self._key_to_file(key))
def _cull(self, filelist): def _cull(self, filelist):
if self.cull_frequency == 0: if self._cull_frequency == 0:
doomed = filelist doomed = filelist
else: else:
doomed = [k for (i, k) in enumerate(filelist) if i % self._cull_frequency == 0] doomed = [k for (i, k) in enumerate(filelist) if i % self._cull_frequency == 0]

8
django/core/rss.py
View File

@ -14,7 +14,7 @@ class FeedDoesNotExist(ObjectDoesNotExist):
class Feed: class Feed:
item_pubdate = None item_pubdate = None
enclosure_url = None item_enclosure_url = None
def item_link(self, item): def item_link(self, item):
try: try:
@ -67,12 +67,12 @@ class Feed:
for item in self.__get_dynamic_attr('items', obj): for item in self.__get_dynamic_attr('items', obj):
link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item)) link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item))
enc = None enc = None
enc_url = self.__get_dynamic_attr('enclosure_url', item) enc_url = self.__get_dynamic_attr('item_enclosure_url', item)
if enc_url: if enc_url:
enc = feedgenerator.Enclosure( enc = feedgenerator.Enclosure(
url = enc_url.decode('utf-8'), url = enc_url.decode('utf-8'),
length = str(self.__get_dynamic_attr('enclosure_length', item)).decode('utf-8'), length = str(self.__get_dynamic_attr('item_enclosure_length', item)).decode('utf-8'),
mime_type = self.__get_dynamic_attr('enclosure_mime_type', item).decode('utf-8'), mime_type = self.__get_dynamic_attr('item_enclosure_mime_type', item).decode('utf-8'),
) )
feed.add_item( feed.add_item(
title = title_template.render(Context({'obj': item, 'site': current_site})).decode('utf-8'), title = title_template.render(Context({'obj': item, 'site': current_site})).decode('utf-8'),

5
docs/authentication.txt
View File

@ -474,3 +474,8 @@ messages are made available in the `template context`_ as the template variable
Note that ``DjangoContext`` calls ``get_and_delete_messages`` behind the Note that ``DjangoContext`` calls ``get_and_delete_messages`` behind the
scenes, so any messages will be deleted even if you don't display them. scenes, so any messages will be deleted even if you don't display them.
Finally, note that this messages framework only works with users in the user
database. To send messages to anonymous users, use the `session framework`_.
.. _session framework: http://www.djangoproject.com/documentation/sessions/

6
docs/settings.txt
View File

@ -416,7 +416,11 @@ Example: ``"http://media.lawrence.com"``
MIDDLEWARE_CLASSES MIDDLEWARE_CLASSES
------------------ ------------------
Default: ``("django.middleware.sessions.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.doc.XViewMiddleware")`` Default::
("django.middleware.sessions.SessionMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.doc.XViewMiddleware")
A tuple of middleware classes to use. See the `middleware docs`_. A tuple of middleware classes to use. See the `middleware docs`_.