Catch TypeError getting empty content-type #127

Author: siznax

tests/test_basic.py

@@ -514,7 +514,6 @@ def test_page_get_more_continue(self):
         self.assertEqual(len(page.data['backlinks']), 501)
 
         qry = page._query('querymore', wptools.query.WPToolsQuery())
-        print("\n\n>>>\n%s\n<<<\n\n" % qry)
         self.assertTrue(qry.endswith('&blcontinue=0|2062757'))
 
     def test_page_get_imageinfo(self):
@@ -871,7 +870,7 @@ def test_request_curl_info(self):
         info = wptools.request.curl_info(req.cobj)
         self.assertEqual(info.get('status'), 0)
         self.assertEqual(info.get('bytes'), 0.0)
-        self.assertEqual(info.get('content'), None)
+        self.assertEqual(info.get('content-type'), None)
         self.assertTrue('wptools' in info.get('user-agent'))
 
     def test_request_curl_setup(self):

wptools/request.py

@@ -120,9 +120,16 @@ def curl_info(crl):
     kbps = crl.getinfo(crl.SPEED_DOWNLOAD) / 1000.0
     url = crl.getinfo(crl.EFFECTIVE_URL)
     url = url.replace("&format=json", '').replace("&formatversion=2", '')
+
+    # https://travis-ci.org/siznax/wptools/jobs/401109410
+    try:
+        content_type = crl.getinfo(crl.CONTENT_TYPE)
+    except TypeError:
+        content_type = None
+
     return {"url": url,
             "user-agent": user_agent(),
-            "content": crl.getinfo(crl.CONTENT_TYPE),
+            "content-type": content_type,
             "status": crl.getinfo(crl.RESPONSE_CODE),
             "bytes": crl.getinfo(crl.SIZE_DOWNLOAD),
             "seconds": "%5.3f" % crl.getinfo(crl.TOTAL_TIME),