rebased with upstream/master

test_requests.py

@@ -495,6 +495,7 @@ class RequestsTestCase(unittest.TestCase):
             headers['ACCEPT'.encode('ascii')],
             'application/json'
         )
+
     def test_uppercase_scheme(self):
         r = requests.get('HTTP://example.com/')
         self.assertEqual(r.status_code, 200)
@@ -502,6 +503,7 @@ class RequestsTestCase(unittest.TestCase):
     def test_uppercase_scheme_redirect(self):
         r = requests.get(httpbin('redirect-to'), params={'url': 'HTTP://example.com/'})
         self.assertEqual(r.status_code, 200)
+
     def test_transport_adapter_ordering(self):
         s = requests.Session()
         order = ['https://', 'http://']