Commit 13643a7f authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #7816 -- Fixed error in a few DeprecationWarnings. Thanks, leahculver 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7997133a

django/db/models/base.py

+2 −6
Original line number Diff line number Diff line
@@ -487,9 +487,7 @@ class Model(object): 
        if isinstance(raw_field, dict):

            import warnings

            warnings.warn(

                message = "Representing uploaded files as dictionaries is"\

                          " deprecated. Use django.core.files.SimpleUploadedFile"\

                          " instead.",

                message = "Representing uploaded files as dictionaries is deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.",

                category = DeprecationWarning,

                stacklevel = 2

            )
@@ -499,9 +497,7 @@ class Model(object): 
        elif isinstance(raw_field, basestring):

            import warnings

            warnings.warn(

                message = "Representing uploaded files as strings is "\

                          " deprecated. Use django.core.files.SimpleUploadedFile "\

                          " instead.",

                message = "Representing uploaded files as dictionaries is deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.",

                category = DeprecationWarning,

                stacklevel = 2

            )

django/newforms/fields.py

+1 −3
Original line number Diff line number Diff line
@@ -442,9 +442,7 @@ class FileField(Field): 
            # We warn once, then support both ways below.

            import warnings

            warnings.warn(

                message = "Representing uploaded files as dictionaries is"\

                          " deprecated. Use django.core.files.SimpleUploadedFile "\

                          " instead.",

                message = "Representing uploaded files as dictionaries is deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.",

                category = DeprecationWarning,

                stacklevel = 2

            )