Merge pull request #355 from sbraz/py37

Fix tests for Python 3.7

Author: jmadler

tests/test_future/test_httplib.py

@@ -197,7 +197,7 @@ def test_bad_status_repr(self):
         if not utils.PY3:
             self.assertEqual(repr(exc), '''BadStatusLine("u\'\'",)''')
         else:
-            self.assertEqual(repr(exc), '''BadStatusLine("\'\'",)''')
+            self.assertIn(repr(exc), ('''BadStatusLine("''",)''', '''BadStatusLine("''")'''))
 
     def test_partial_reads(self):
         # if we have a length, the system knows when to close itself

tests/test_future/test_int.py

@@ -265,12 +265,17 @@ def test_small_ints(self):
     def test_no_args(self):
         self.assertEqual(int(), 0)
 
-    def test_keyword_args(self):
+    @unittest.skipIf(sys.version_info >= (3, 7),
+            "The first parameter must be positional with Python >= 3.7"
+    )
+    def test_x_keyword_arg(self):
         # Test invoking int() using keyword arguments.
         self.assertEqual(int(x=1.2), 1)
-        self.assertEqual(int('100', base=2), 4)
         self.assertEqual(int(x='100', base=2), 4)
 
+    def text_base_keyword_arg(self):
+        self.assertEqual(int('100', base=2), 4)
+
     def test_newint_plus_float(self):
         minutes = int(100)
         second = 0.0