summaryrefslogtreecommitdiff
path: root/django/views/decorators
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-07-18 17:23:04 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-07-18 17:23:04 +0000
commit912253371d58a27427719d50aa5cf140153f78df (patch)
tree307bcfb082e0f361a6db5a64291f6d8dee1d80bf /django/views/decorators
parentb68c478aa5d890e76aae6e2f695220505618c8e0 (diff)
Moved django.views.decorators.cache.compress_string into django.utils.text
git-svn-id: http://code.djangoproject.com/svn/django/trunk@175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/views/decorators')
-rw-r--r--django/views/decorators/cache.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/django/views/decorators/cache.py b/django/views/decorators/cache.py
index 52501f74d5..7c76ef272d 100644
--- a/django/views/decorators/cache.py
+++ b/django/views/decorators/cache.py
@@ -1,15 +1,7 @@
from django.core.cache import cache
from django.utils.httpwrappers import HttpResponseNotModified
-import cStringIO, datetime, gzip, md5
-
-# From http://www.xhaus.com/alan/python/httpcomp.html#gzip
-# Used with permission.
-def compress_string(s):
- zbuf = cStringIO.StringIO()
- zfile = gzip.GzipFile(mode='wb', compresslevel=6, fileobj=zbuf)
- zfile.write(s)
- zfile.close()
- return zbuf.getvalue()
+from django.utils.text import compress_string
+import datetime, md5
def cache_page(view_func, cache_timeout, key_prefix=''):
"""
@@ -21,7 +13,7 @@ def cache_page(view_func, cache_timeout, key_prefix=''):
variable. Use key_prefix if your Django setup has multiple sites that
use cache; otherwise the cache for one site would affect the other. A good
example of key_prefix is to use sites.get_current().domain, because that's
- unique across all CMS instances on a particular server.
+ unique across all Django instances on a particular server.
"""
def _check_cache(request, *args, **kwargs):
try: