mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	Fixed #27842 -- Added protocol kwarg to GenericSitemap.__init__().
This commit is contained in:
		
				
					committed by
					
						 Tim Graham
						Tim Graham
					
				
			
			
				
	
			
			
			
						parent
						
							81957086c1
						
					
				
				
					commit
					9f21e35100
				
			| @@ -142,11 +142,12 @@ class GenericSitemap(Sitemap): | ||||
|     priority = None | ||||
|     changefreq = None | ||||
|  | ||||
|     def __init__(self, info_dict, priority=None, changefreq=None): | ||||
|     def __init__(self, info_dict, priority=None, changefreq=None, protocol=None): | ||||
|         self.queryset = info_dict['queryset'] | ||||
|         self.date_field = info_dict.get('date_field') | ||||
|         self.priority = priority | ||||
|         self.changefreq = changefreq | ||||
|         self.protocol = protocol | ||||
|  | ||||
|     def items(self): | ||||
|         # Make sure to return a clone; we don't want premature evaluation. | ||||
|   | ||||
| @@ -259,7 +259,7 @@ Shortcuts | ||||
|  | ||||
| The sitemap framework provides a convenience class for a common case: | ||||
|  | ||||
| .. class:: GenericSitemap | ||||
| .. class:: GenericSitemap(info_dict, priority=None, changefreq=None, protocol=None) | ||||
|  | ||||
|     The :class:`django.contrib.sitemaps.GenericSitemap` class allows you to | ||||
|     create a sitemap by passing it a dictionary which has to contain at least | ||||
| @@ -267,10 +267,15 @@ The sitemap framework provides a convenience class for a common case: | ||||
|     of the sitemap. It may also have a ``date_field`` entry that | ||||
|     specifies a date field for objects retrieved from the ``queryset``. | ||||
|     This will be used for the :attr:`~Sitemap.lastmod` attribute in the | ||||
|     generated sitemap. You may also pass :attr:`~Sitemap.priority` and | ||||
|     :attr:`~Sitemap.changefreq` keyword arguments to the | ||||
|     :class:`~django.contrib.sitemaps.GenericSitemap`  constructor to specify | ||||
|     these attributes for all URLs. | ||||
|     generated sitemap. | ||||
|  | ||||
|     The :attr:`~Sitemap.priority`, :attr:`~Sitemap.changefreq`, | ||||
|     and :attr:`~Sitemap.protocol` keyword arguments allow specifying these | ||||
|     attributes for all URLs. | ||||
|  | ||||
|     .. versionadded:: 2.0 | ||||
|  | ||||
|         The ``protocol`` keyword argument was added. | ||||
|  | ||||
| Example | ||||
| ------- | ||||
|   | ||||
| @@ -89,7 +89,8 @@ Minor features | ||||
| :mod:`django.contrib.sitemaps` | ||||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||||
|  | ||||
| * ... | ||||
| * Added the ``protocol`` keyword argument to the | ||||
|   :class:`~django.contrib.sitemaps.GenericSitemap` constructor. | ||||
|  | ||||
| :mod:`django.contrib.sites` | ||||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||||
|   | ||||
| @@ -20,11 +20,13 @@ class GenericViewsSitemapTests(SitemapTestsBase): | ||||
|             }, | ||||
|             priority=0.6, | ||||
|             changefreq='monthly', | ||||
|             protocol='https', | ||||
|         ) | ||||
|         attr_values = ( | ||||
|             ('date_field', datetime_value), | ||||
|             ('priority', 0.6), | ||||
|             ('changefreq', 'monthly'), | ||||
|             ('protocol', 'https'), | ||||
|         ) | ||||
|         for attr_name, expected_value in attr_values: | ||||
|             with self.subTest(attr_name=attr_name): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user