add Python 3 compatibility

diff --git a/requests/cookies.py b/requests/cookies.py
index 7b50b4f..0e0dd67 100644 (file)
--- a/requests/cookies.py
+++ b/requests/cookies.py
@@ -259,6 +259,6 @@ def cookiejar_from_dict(cookie_dict, cookiejar=None):
         cookiejar = RequestsCookieJar()
 
     if cookie_dict is not None:
-        for name, value in cookie_dict.iteritems():
-            cookiejar.set_cookie(create_cookie(name, value))
+        for name in cookie_dict:
+            cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
     return cookiejar

diff --git a/tests/test_requests.py b/tests/test_requests.py
index 5b897a7..fb0d75c 100755 (executable)
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -55,7 +55,7 @@ class TestBaseMixin(object):
 
     def assertCookieHas(self, cookie, **kwargs):
         """Assert that a cookie has various specified properties."""
-        for attr, expected_value in kwargs.iteritems():
+        for attr, expected_value in kwargs.items():
             message = 'Failed comparison for %s' % (attr,)
             self.assertEqual(getattr(cookie, attr), expected_value, message)