Fixing 3.x issues, removing 2.6 from official support.

Author: Josh Mervine

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"

maxcdn/maxcdn.py

@@ -1,5 +1,4 @@
 from requests_oauthlib import OAuth1Session as OAuth1
-from pprint import pprint
 
 # handle python 3.x
 try:
@@ -28,7 +27,7 @@ def _get_url(self, end_point):
     def _parse_json(self, response):
         try:
             return response.json()
-        except ValueError, e:
+        except ValueError as e:
             raise self.ServerError(response, e.message)
 
     def _data_request(self, method, end_point, data, **kwargs):
@@ -89,4 +88,3 @@ def __init__(self, response, message=None):
             self.url = response.url
 
             super(Exception, self).__init__(message)
-

test/test.py

@@ -78,7 +78,7 @@ def test_data_request(self):
 
             requests.Session.request = mock.create_autospec(mock_request,
                     return_value=error_response())
-        with self.assertRaises(MaxCDN.ServerError):
+        with self.assertRaises(MaxCDN.ServerError, None):
                 self.maxcdn._data_request(meth, meth+".json", data={"foo":"bar"})
 
     def test_get(self):
@@ -90,7 +90,7 @@ def test_get(self):
 
         requests.Session.request = mock.create_autospec(mock_request,
                 return_value=error_response())
-        with self.assertRaises(MaxCDN.ServerError):
+        with self.assertRaises(MaxCDN.ServerError, None):
             self.maxcdn.get("/get.json")
 
     def test_post(self):