merge 3.2 (#20695)

diff --cc Lib/test/test_urllibnet.py
index 4e0b7bde9ad7ef54c7ec17dfe654d83e6d75fac0,573c0c15d541a874240c7bc1bc1855a4004f3a15..38afb69250c68e8180031ac9a155752891e9967a
--- 1/Lib/test/test_urllibnet.py
--- 2/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@@ -170,10 -170,9 +170,10 @@@ class urlretrieveNetworkTests(unittest.
              self.assertIsInstance(info, email.message.Message,
                                    "info is not an instance of email.message.Message")
  
-     logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
++    logo = "http://www.python.org/static/community_logos/python-logo-master-v3-TM.png"
 +
      def test_data_header(self):
 -        logo = "http://www.python.org/static/community_logos/python-logo-master-v3-TM.png"
 -        with self.urlretrieve(logo) as (file_location, fileheaders):
 +        with self.urlretrieve(self.logo) as (file_location, fileheaders):
              datevalue = fileheaders.get('Date')
              dateformat = '%a, %d %b %Y %H:%M:%S GMT'
              try: