Ticket #12844: lazy.patch

django/core/context_processors.py

@@ -8 +8 @@
 """
 
 from django.conf import settings
-from django.middleware.csrf import get_token
 from django.utils.functional import lazy, memoize, SimpleLazyObject
-from django.contrib import messages
 
 def auth(request):
     """
@@ -36 +34 @@
             from django.contrib.auth.models import AnonymousUser
             return AnonymousUser()
 
+    from django.contrib import messages
     return {
         'user': SimpleLazyObject(get_user),
         'messages': messages.get_messages(request),
@@ -48 +47 @@
     it has not been provided by either a view decorator or the middleware
     """
     def _get_val():
+        from django.middleware.csrf import get_token
         token = get_token(request)
         if token is None:
             # In order to be able to provide debugging info in the

django/core/files/storage.py

@@ -4 +4 @@
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
-from django.core.files import locks, File
-from django.core.files.move import file_move_safe
+from django.core.files import File
 from django.utils.encoding import force_unicode, smart_str
 from django.utils.functional import LazyObject
 from django.utils.importlib import import_module
@@ -153 +152 @@
             try:
                 # This file has a file path that we can move.
                 if hasattr(content, 'temporary_file_path'):
+                    from django.core.files.move import file_move_safe
                     file_move_safe(content.temporary_file_path(), full_path)
                     content.close()
 
@@ -161 +161 @@
                     # This fun binary flag incantation makes os.open throw an
                     # OSError if the file already exists before we open it.
                     fd = os.open(full_path, os.O_WRONLY | os.O_CREAT | os.O_EXCL | getattr(os, 'O_BINARY', 0))
+                    from django.core.files import locks
                     try:
                         locks.lock(fd, locks.LOCK_EX)
                         for chunk in content.chunks():

django/core/files/uploadedfile.py

@@ -10 +10 @@
 
 from django.conf import settings
 from django.core.files.base import File
-from django.core.files import temp as tempfile
 from django.utils.encoding import smart_str
 
 __all__ = ('UploadedFile', 'TemporaryUploadedFile', 'InMemoryUploadedFile',
@@ -59 +58 @@
     A file uploaded to a temporary location (i.e. stream-to-disk).
     """
     def __init__(self, name, content_type, size, charset):
+        from django.core.files import temp as tempfile
         if settings.FILE_UPLOAD_TEMP_DIR:
             file = tempfile.NamedTemporaryFile(suffix='.upload',
                 dir=settings.FILE_UPLOAD_TEMP_DIR)

django/db/backends/creation.py

@@ -7 +7 @@
     from sets import Set as set
 
 from django.conf import settings
-from django.core.management import call_command
 
 # The prefix to put on the default database name when creating
 # the test database.
@@ -355 +354 @@
         can_rollback = self._rollback_works()
         self.connection.settings_dict["SUPPORTS_TRANSACTIONS"] = can_rollback
 
+        from django.core.management import call_command
         call_command('syncdb', verbosity=verbosity, interactive=False, database=self.connection.alias)
 
         if settings.CACHE_BACKEND.startswith('db://'):

django/db/models/fields/__init__.py

@@ -9 +9 @@
 from django.db.models.fields.subclassing import LegacyConnection
 from django.db.models.query_utils import QueryWrapper
 from django.conf import settings
-from django import forms
 from django.core import exceptions, validators
 from django.utils.datastructures import DictWrapper
 from django.utils.functional import curry
@@ -441 +440 @@
     def save_form_data(self, instance, data):
         setattr(instance, self.name, data)
 
-    def formfield(self, form_class=forms.CharField, **kwargs):
+    def formfield(self, form_class=None, **kwargs):
+        from django import forms
+        if form_class is None:
+            form_class = forms.CharField
         "Returns a django.forms.Field instance for this database Field."
-        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+        defaults = {
+            'required': not self.blank,
+            'label': capfirst(self.verbose_name),
+            'help_text': self.help_text
+        }
         if self.has_default():
             defaults['initial'] = self.get_default()
             if callable(self.default):
@@ -550 +556 @@
             include_blank = self.null or not (self.has_default() or 'initial' in kwargs)
             defaults = {'choices': self.get_choices(include_blank=include_blank)}
         else:
+            from django import forms
             defaults = {'form_class': forms.BooleanField}
         defaults.update(kwargs)
         return super(BooleanField, self).formfield(**defaults)
@@ -677 +684 @@
         return data
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.DateField}
         defaults.update(kwargs)
         return super(DateField, self).formfield(**defaults)
@@ -744 +752 @@
         return data
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.DateTimeField}
         defaults.update(kwargs)
         return super(DateTimeField, self).formfield(**defaults)
@@ -798 +807 @@
         return self.to_python(value)
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {
             'max_digits': self.max_digits,
             'decimal_places': self.decimal_places,
@@ -823 +833 @@
         Field.__init__(self, verbose_name, name, **kwargs)
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {
             'path': self.path,
             'match': self.match,
@@ -859 +870 @@
             raise exceptions.ValidationError(self.error_messages['invalid'])
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.FloatField}
         defaults.update(kwargs)
         return super(FloatField, self).formfield(**defaults)
@@ -887 +899 @@
             raise exceptions.ValidationError(self.error_messages['invalid'])
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.IntegerField}
         defaults.update(kwargs)
         return super(IntegerField, self).formfield(**defaults)
@@ -915 +928 @@
         return "IPAddressField"
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.IPAddressField}
         defaults.update(kwargs)
         return super(IPAddressField, self).formfield(**defaults)
@@ -955 +969 @@
         return bool(value)
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {
             'form_class': forms.NullBooleanField,
             'required': not self.blank,
@@ -997 +1012 @@
         return "SlugField"
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.SlugField}
         defaults.update(kwargs)
         return super(SlugField, self).formfield(**defaults)
@@ -1019 +1035 @@
         return smart_unicode(value)
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'widget': forms.Textarea}
         defaults.update(kwargs)
         return super(TextField, self).formfield(**defaults)
@@ -1099 +1116 @@
         return data
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.TimeField}
         defaults.update(kwargs)
         return super(TimeField, self).formfield(**defaults)

django/db/models/fields/files.py

@@ -6 +6 @@
 from django.conf import settings
 from django.db.models.fields import Field
 from django.core.files.base import File, ContentFile
-from django.core.files.storage import default_storage
 from django.core.files.images import ImageFile, get_image_dimensions
 from django.core.files.uploadedfile import UploadedFile
 from django.utils.functional import curry
 from django.db.models import signals
 from django.utils.encoding import force_unicode, smart_str
 from django.utils.translation import ugettext_lazy, ugettext as _
-from django import forms
 from django.db.models.loading import cache
 
 class FieldFile(File):
@@ -224 +222 @@
             if arg in kwargs:
                 raise TypeError("'%s' is not a valid argument for %s." % (arg, self.__class__))
 
-        self.storage = storage or default_storage
+        if not storage:
+            from django.core.files.storage import default_storage as storage
+        self.storage = storage
         self.upload_to = upload_to
         if callable(upload_to):
             self.generate_filename = upload_to
@@ -286 +286 @@
             setattr(instance, self.name, data)
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.FileField, 'max_length': self.max_length}
         # If a file has been provided previously, then the form doesn't require
         # that a new file is provided this time.
@@ -398 +399 @@
             setattr(instance, self.height_field, height)
 
     def formfield(self, **kwargs):
+        from django import forms
         defaults = {'form_class': forms.ImageField}
         defaults.update(kwargs)
         return super(ImageField, self).formfield(**defaults)

django/db/models/fields/related.py

@@ -11 +11 @@
 from django.utils.translation import ugettext_lazy as _, string_concat, ungettext, ugettext
 from django.utils.functional import curry
 from django.core import exceptions
-from django import forms
 
 
 RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
@@ -845 +844 @@
             self.rel.field_name = cls._meta.pk.name
 
     def formfield(self, **kwargs):
+        from django import forms
         db = kwargs.pop('using', None)
         defaults = {
             'form_class': forms.ModelChoiceField,
@@ -1099 +1099 @@
         setattr(instance, self.attname, data)
 
     def formfield(self, **kwargs):
+        from django import forms
         db = kwargs.pop('using', None)
         defaults = {
             'form_class': forms.ModelMultipleChoiceField,

django/http/__init__.py

@@ -12 +12 @@
 
 from django.utils.datastructures import MultiValueDict, ImmutableList
 from django.utils.encoding import smart_str, iri_to_uri, force_unicode
-from django.http.multipartparser import MultiPartParser
 from django.conf import settings
 from django.core.files import uploadhandler
 from utils import *
@@ -120 +119 @@
             self.upload_handlers,
             warning = "You cannot alter upload handlers after the upload has been processed."
         )
+        from django.http.multipartparser import MultiPartParser
         parser = MultiPartParser(META, post_data, self.upload_handlers, self.encoding)
         return parser.parse()