From: Bob Carroll <bob.carroll@alum.rit.edu>
Date: Wed, 1 May 2013 18:37:58 +0000 (-0700)
Subject: this didn't merge properly
X-Git-Tag: 2.0~19^2~11^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d59510481ad624641ec404bac423e8ab44f0f41b;p=services%2Fpython-requests.git

this didn't merge properly
---

diff --git a/test_requests.py b/test_requests.py
index 017058f..02a1837 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -499,6 +499,9 @@ class RequestsTestCase(unittest.TestCase):
         r = requests.get('HTTP://example.com/')
         self.assertEqual(r.status_code, 200)
 
+    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://']
@@ -705,10 +708,5 @@ class TestCaseInsensitiveDict(unittest.TestCase):
         self.assertEqual(frozenset(cid), keyset)
 
 
-
-    def test_uppercase_scheme_redirect(self):
-        r = requests.get(httpbin('redirect-to'), params={'url': 'HTTP://example.com/'})
-        self.assertEqual(r.status_code, 200)
-
 if __name__ == '__main__':
     unittest.main()