Commit 1fed8dd7 authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #25120 -- Deprecated egg template loader.

parent 8e306967

django/conf/global_settings.py

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ TEMPLATE_DIRS = [] 
TEMPLATE_LOADERS = [

    'django.template.loaders.filesystem.Loader',

    'django.template.loaders.app_directories.Loader',

    # 'django.template.loaders.eggs.Loader',

]



# List of processors used by RequestContext to populate the context.

django/template/loaders/eggs.py

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ try: 
except ImportError:

    resource_string = None



warnings.warn('The egg template loader is deprecated.', RemovedInDjango20Warning)





class EggOrigin(Origin):

docs/internals/deprecation.txt

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ details on these changes. 
* ``Field._get_val_from_obj()`` will be removed in favor of

  ``Field.value_from_object()``.



* ``django.template.loaders.eggs.Loader`` will be removed.



.. _deprecation-removed-in-1.10:



1.10

docs/ref/templates/api.txt

+4 −0
Original line number Diff line number Diff line
@@ -893,6 +893,10 @@ loaders that come with Django: 


.. class:: eggs.Loader



    .. deprecated:: 1.9



        Distributing applications as eggs is not recommended.



    Just like ``app_directories`` above, but it loads templates from Python

    eggs rather than from the filesystem.

docs/releases/1.9.txt

+3 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,9 @@ Miscellaneous 
* ``django.db.models.Field._get_val_from_obj()`` is deprecated in favor of

  ``Field.value_from_object()``.



* ``django.template.loaders.eggs.Loader`` is deprecated as distributing

  applications as eggs is not recommended.



.. removed-features-1.9:



Features removed in 1.9