Ticket #32397: add-user-agent-to-django-admin-templates.diff

django/core/management/templates.py

@@ -6 +6 @@
 import stat
 import tempfile
 from importlib import import_module
-from urllib.request import urlretrieve
+from urllib.request import Request, urlopen
 
 import django
 from django.conf import settings
@@ -262 +262 @@
         if self.verbosity >= 2:
             self.stdout.write('Downloading %s' % display_url)
         try:
-            the_path, info = urlretrieve(url, os.path.join(tempdir, filename))
+            response = urlopen(Request(url, headers={'User-Agent': f'Django/{django.getversion()}'}))
+            the_path = os.path.join(tempdir, filename)
+            with open(the_path, 'wb') as f:
+                f.write(response.read())
+
         except OSError as e:
             raise CommandError("couldn't download URL %s to %s: %s" %
                                (url, filename, e))
@@ -270 +274 @@
         used_name = the_path.split('/')[-1]
 
         # Trying to get better name from response headers
-        content_disposition = info.get('content-disposition')
+        content_disposition = response.info.getheader('content-disposition')
         if content_disposition:
             _, params = cgi.parse_header(content_disposition)
             guessed_filename = params.get('filename') or used_name
@@ -279 +283 @@
 
         # Falling back to content type guessing
         ext = self.splitext(guessed_filename)[1]
-        content_type = info.get('content-type')
+        content_type = response.info.getheader('content-type')
         if not ext and content_type:
             ext = mimetypes.guess_extension(content_type)
             if ext: