From 5c5b266b5478aa4e8bd92f141c56f3a0997749eb Mon Sep 17 00:00:00 2001 From: Baptiste Mispelon Date: Wed, 12 Mar 2014 23:09:18 +0100 Subject: [PATCH] Simplified implementation of collectstatic command. Since d2e242d16c6dde6f4736086fb38057424bed3edb made isinstance() calls work correctly on LazyObject, we can simplify the implementation of is_local_storage added in 7e27885c6e7588471fd94a4def16b7081577bdfc. --- .../staticfiles/management/commands/collectstatic.py | 7 +------ django/utils/functional.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py index ce2a9ebdd5..bc247c8177 100644 --- a/django/contrib/staticfiles/management/commands/collectstatic.py +++ b/django/contrib/staticfiles/management/commands/collectstatic.py @@ -7,7 +7,6 @@ from optparse import make_option from django.core.files.storage import FileSystemStorage from django.core.management.base import CommandError, NoArgsCommand from django.utils.encoding import smart_text -from django.utils.functional import LazyObject from django.utils.six.moves import input from django.contrib.staticfiles import finders, storage @@ -193,11 +192,7 @@ class Command(NoArgsCommand): self.stdout.write(msg) def is_local_storage(self): - if issubclass(self.storage.__class__, LazyObject): - storage = self.storage._wrapped - else: - storage = self.storage - return isinstance(storage, FileSystemStorage) + return isinstance(self.storage, FileSystemStorage) def clear_dir(self, path): """ diff --git a/django/utils/functional.py b/django/utils/functional.py index 35f48c6251..361b0f14fb 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -367,7 +367,7 @@ class SimpleLazyObject(LazyObject): def __deepcopy__(self, memo): if self._wrapped is empty: - # We have to use type(self), not self.__class__, because the + # We have to use SimpleLazyObject, not self.__class__, because the # latter is proxied. result = SimpleLazyObject(self._setupfunc) memo[id(self)] = result