diff --git a/.travis.yml b/.travis.yml index e3f9cf9..3d3b769 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python python: + - "2.6" - "2.7" - "3.4" # command to install dependencies diff --git a/sift/client.py b/sift/client.py index d871768..d482358 100644 --- a/sift/client.py +++ b/sift/client.py @@ -7,7 +7,7 @@ import requests import traceback import sys -if sys.version_info.major < 3: +if sys.version_info[0] < 3: import urllib else: import urllib.parse as urllib @@ -44,7 +44,7 @@ def __init__(self, api_key = None, api_url=API_URL, timeout=2.0): self.api_key = api_key self.url = api_url + '/v%s' % version.API_VERSION self.timeout = timeout - if sys.version_info.major < 3: + if sys.version_info[0] < 3: self.UNICODE_STRING = basestring else: self.UNICODE_STRING = str diff --git a/tests/client_test.py b/tests/client_test.py index 5c1762d..e2d57c0 100644 --- a/tests/client_test.py +++ b/tests/client_test.py @@ -5,7 +5,7 @@ import unittest import sys import requests.exceptions -if sys.version_info.major < 3: +if sys.version_info[0] < 3: import urllib else: import urllib.parse as urllib @@ -51,8 +51,7 @@ def response_with_data_header(): } class TestSiftPythonClient(unittest.TestCase): - @classmethod - def setUpClass(self): + def setUp(self): self.test_key = 'a_fake_test_api_key' self.sift_client = sift.Client(self.test_key) @@ -239,7 +238,7 @@ def test_unlabel_user_ok(self): def test_unicode_string_parameter_support(self): # str is unicode in python 3, so no need to check as this was covered by other unit tests. - if sys.version_info.major < 3: + if sys.version_info[0] < 3: mock_response = mock.Mock() mock_response.content = '{"status": 0, "error_message": "OK"}' mock_response.json.return_value = json.loads(mock_response.content)