From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 20 Feb 2014 04:06:24 +0000 (-0500)
Subject: merge 3.2 (#20695)
X-Git-Tag: v3.3.5rc1^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a96fd48298db04cedbdb0cb75fc124ba58ff7bb4;p=python

merge 3.2 (#20695)
---

a96fd48298db04cedbdb0cb75fc124ba58ff7bb4
diff --cc Lib/test/test_urllibnet.py
index 4e0b7bde9a,573c0c15d5..38afb69250
--- a/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: