mirror of
				https://github.com/django/django.git
				synced 2025-10-31 01:25:32 +00:00 
			
		
		
		
	Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
		| @@ -142,7 +142,7 @@ def find_template_source(name, dirs=None): | ||||
|     import warnings | ||||
|     warnings.warn( | ||||
|         "`django.template.loaders.find_template_source` is deprecated; use `django.template.loaders.find_template` instead.", | ||||
|         PendingDeprecationWarning | ||||
|         DeprecationWarning | ||||
|     ) | ||||
|     template, origin = find_template(name, dirs) | ||||
|     if hasattr(template, 'render'): | ||||
|   | ||||
| @@ -68,7 +68,7 @@ def load_template_source(template_name, template_dirs=None): | ||||
|     import warnings | ||||
|     warnings.warn( | ||||
|         "'django.template.loaders.app_directories.load_template_source' is deprecated; use 'django.template.loaders.app_directories.Loader' instead.", | ||||
|         PendingDeprecationWarning | ||||
|         DeprecationWarning | ||||
|     ) | ||||
|     return _loader.load_template_source(template_name, template_dirs) | ||||
| load_template_source.is_usable = True | ||||
|   | ||||
| @@ -33,7 +33,7 @@ def load_template_source(template_name, template_dirs=None): | ||||
|     import warnings | ||||
|     warnings.warn( | ||||
|         "'django.template.loaders.eggs.load_template_source' is deprecated; use 'django.template.loaders.eggs.Loader' instead.", | ||||
|         PendingDeprecationWarning | ||||
|         DeprecationWarning | ||||
|     ) | ||||
|     return _loader.load_template_source(template_name, template_dirs) | ||||
| load_template_source.is_usable = resource_string is not None | ||||
|   | ||||
| @@ -55,7 +55,7 @@ def load_template_source(template_name, template_dirs=None): | ||||
|     import warnings | ||||
|     warnings.warn( | ||||
|         "'django.template.loaders.filesystem.load_template_source' is deprecated; use 'django.template.loaders.filesystem.Loader' instead.", | ||||
|         PendingDeprecationWarning | ||||
|         DeprecationWarning | ||||
|     ) | ||||
|     return _loader.load_template_source(template_name, template_dirs) | ||||
| load_template_source.is_usable = True | ||||
|   | ||||
		Reference in New Issue
	
	Block a user