Adapts codebase to >= 2.7

Author: 0bsearch

python_http_client/client.py

@@ -64,7 +64,7 @@ class Client(object):
     """Quickly and easily access any REST or REST-like API."""
 
     # These are the supported HTTP verbs
-    methods = set(('delete', 'get', 'patch', 'post', 'put'))
+    methods = {'delete', 'get', 'patch', 'post', 'put'}
 
     def __init__(self,
                  host,
@@ -242,7 +242,8 @@ def http_request(
                     # Don't serialize to a JSON formatted str
                     # if we don't have a JSON Content-Type
                     if 'Content-Type' in self.request_headers and \
-                            self.request_headers['Content-Type'] != 'application/json':
+                            self.request_headers['Content-Type'] != \
+                            'application/json':
                         data = request_body.encode('utf-8')
                     else:
                         self.request_headers.setdefault(
@@ -257,7 +258,9 @@ def http_request(
                 )
                 request.get_method = lambda: method
 
-                return Response(self._make_request(opener, request, timeout=timeout))
+                return Response(
+                    self._make_request(opener, request, timeout=timeout)
+                )
             return http_request
         else:
             # Add a segment to the URL

tests/test_unit.py

@@ -81,7 +81,7 @@ def test__init__(self):
         self.assertEqual(default_client.host, self.host)
         self.assertEqual(default_client.request_headers, {})
         self.assertIs(default_client.timeout, None)
-        methods = set(('delete', 'get', 'patch', 'post', 'put'))
+        methods = {'delete', 'get', 'patch', 'post', 'put'}
         self.assertEqual(default_client.methods, methods)
         self.assertIsNone(default_client._version)
         self.assertEqual(default_client._url_path, [])
@@ -94,7 +94,7 @@ def test__init__(self):
                         timeout=10)
         self.assertEqual(client.host, self.host)
         self.assertEqual(client.request_headers, request_headers)
-        methods = set(('delete', 'get', 'patch', 'post', 'put'))
+        methods = {'delete', 'get', 'patch', 'post', 'put'}
         self.assertEqual(client.methods, methods)
         self.assertEqual(client._version, 3)
         self.assertEqual(client._url_path, [])
@@ -125,7 +125,7 @@ def test__urllib_headers(self, maker):
         self.client._update_headers({'X-test': 'Test'})
         self.client.get()
         request = maker.call_args[0][1]
-        self.assertTrue('X-test' in request.headers)
+        self.assertIn('X-test', request.headers)
 
     @mock.patch('python_http_client.client.Client._make_request')
     def test__urllib_method(self, maker):