From 0ec712dd1190f609d928bbaa1d635e692a75242b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 23 Nov 2013 08:26:11 -0800 Subject: [PATCH] A handful of flake8 fixes --- django/core/cache/__init__.py | 1 + django/templatetags/cache.py | 2 +- tests/cache/tests.py | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py index 6829b747725..2cdbe4a04d7 100644 --- a/django/core/cache/__init__.py +++ b/django/core/cache/__init__.py @@ -114,6 +114,7 @@ class CacheHandler(object): caches = CacheHandler() + class DefaultCacheProxy(object): """ Proxy access to the default Cache object's attributes. diff --git a/django/templatetags/cache.py b/django/templatetags/cache.py index bdea9b59ae0..994868e43a7 100644 --- a/django/templatetags/cache.py +++ b/django/templatetags/cache.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.core.cache import cache, caches, InvalidCacheBackendError +from django.core.cache import caches, InvalidCacheBackendError from django.core.cache.utils import make_template_fragment_key from django.template import Library, Node, TemplateSyntaxError, VariableDoesNotExist diff --git a/tests/cache/tests.py b/tests/cache/tests.py index c416ae6c2d5..0e512a6a411 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -6,10 +6,8 @@ from __future__ import unicode_literals import os import pickle -import random import re import shutil -import string import tempfile import threading import time @@ -1039,8 +1037,8 @@ class MemcachedCacheTests(BaseCacheTests, TestCase): # Explicitly display a skipped test if no configured cache uses MemcachedCache @unittest.skipUnless( - any(cache['BACKEND'] == 'django.core.cache.backends.memcached.MemcachedCache' - for cache in settings.CACHES.values()), + any(c['BACKEND'] == 'django.core.cache.backends.memcached.MemcachedCache' + for c in settings.CACHES.values()), "cache with python-memcached library not available") def test_memcached_uses_highest_pickle_version(self): # Regression test for #19810 @@ -1159,7 +1157,6 @@ class CacheUtils(TestCase): self.path = '/cache/test/' self.factory = RequestFactory() - def test_patch_vary_headers(self): headers = ( # Initial vary, new headers, resulting vary. @@ -1903,6 +1900,7 @@ class TestMakeTemplateFragmentKey(TestCase): self.assertEqual(key, 'template.cache.spam.f27688177baec990cdf3fbd9d9c3f469') + class CacheHandlerTest(TestCase): def test_same_instance(self): """ @@ -1919,6 +1917,7 @@ class CacheHandlerTest(TestCase): instances. """ c = [] + def runner(): c.append(caches['default'])