Revert "Support python 2.6"

This reverts commit 158f6e6183.

test_elasticsearch/test_cases.py

@@ -27,7 +27,7 @@ class ElasticsearchTestCase(TestCase):
         self.assertEquals(count, self.client.transport.call_count)
 
     def assert_url_called(self, method, url, count=1):
-        self.assertTrue((method, url) in self.client.transport.calls)
+        self.assertIn((method, url), self.client.transport.calls)
         calls = self.client.transport.calls[(method, url)]
         self.assertEquals(count, len(calls))
         return calls
@@ -35,7 +35,7 @@ class ElasticsearchTestCase(TestCase):
 
 class TestElasticsearchTestCase(ElasticsearchTestCase):
     def test_our_transport_used(self):
-        self.assertTrue(isinstance(self.client.transport, DummyTransport))
+        self.assertIsInstance(self.client.transport, DummyTransport)
 
     def test_start_with_0_call(self):
         self.assert_call_count_equals(0)

test_elasticsearch/test_client/test_utils.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-from unittest import TestCase
+from unittest import TestCase, SkipTest
-from nose import SkipTest
 
 from elasticsearch.client.utils import _make_path
 

test_elasticsearch/test_connection_pool.py

@@ -91,5 +91,5 @@ class TestConnectionPool(TestCase):
 
         self.assertEquals(3, pool.dead_count[42])
         pool.mark_live(42)
-        self.assertFalse(42 in pool.dead_count)
+        self.assertNotIn(42, pool.dead_count)
 

test_elasticsearch/test_server/__init__.py

@@ -8,8 +8,7 @@ import requests
 from elasticsearch import Elasticsearch
 from elasticsearch.exceptions import ConnectionError
 
-from unittest import TestCase
+from unittest import SkipTest, TestCase
-from nose import SkipTest
 
 data_dir = None
 

test_elasticsearch/test_server/test_common.py

@@ -6,7 +6,7 @@ clients.
 from os import walk, environ
 from os.path import exists, join, dirname, pardir
 import yaml
-from nose import SkipTest
+from unittest import SkipTest
 
 from . import ElasticTestCase
 
@@ -53,7 +53,7 @@ class YamlTestCase(ElasticTestCase):
         # resolve variables
         if isinstance(value, (type(u''), type(''))) and value.startswith('$'):
             value = value[1:]
-            self.assertTrue(value in self._state)
+            self.assertIn(value, self._state)
             value = self._state[value]
         return value
 
@@ -67,10 +67,10 @@ class YamlTestCase(ElasticTestCase):
             step = step.replace('\1', '.')
             if step.isdigit():
                 step = int(step)
-                self.assertTrue(isinstance(value, list))
+                self.assertIsInstance(value, list)
-                self.assertTrue(len(value) > step)
+                self.assertGreater(len(value), step)
             else:
-                self.assertTrue(step in value)
+                self.assertIn(step, value)
             value = value[step]
         return value
 
@@ -133,11 +133,11 @@ class YamlTestCase(ElasticTestCase):
 
     def run_gt(self, action):
         for key, value in action.items():
-            self.assertTrue(self._lookup(key) > value)
+            self.assertGreater(self._lookup(key), value)
 
     def run_lt(self, action):
         for key, value in action.items():
-            self.assertTrue(self._lookup(key) < value)
+            self.assertLess(self._lookup(key), value)
 
     def run_set(self, action):
         for key, value in action.items():

test_elasticsearch/test_server/test_memcached.py

@@ -5,7 +5,7 @@ from elasticsearch.transport import ADDRESS_RE
 
 from . import ElasticTestCase
 
-from nose import SkipTest
+from unittest import SkipTest
 
 class TestMemcachedConnection(ElasticTestCase):
     def setUp(self):

test_elasticsearch/test_transport.py

@@ -41,7 +41,7 @@ class TestTransport(TestCase):
     def test_kwargs_passed_on_to_connection_pool(self):
         dt = object()
         t = Transport([{}], dead_timeout=dt)
-        self.assertTrue(dt is t.connection_pool.dead_timeout)
+        self.assertIs(dt, t.connection_pool.dead_timeout)
 
     def test_custom_connection_class(self):
         class MyConnection(object):
@@ -49,7 +49,7 @@ class TestTransport(TestCase):
                 self.kwargs = kwargs
         t = Transport([{}], connection_class=MyConnection)
         self.assertEquals(1, len(t.connection_pool.connections))
-        self.assertTrue(isinstance(t.connection_pool.connections[0], MyConnection))
+        self.assertIsInstance(t.connection_pool.connections[0], MyConnection)
 
     def test_add_connection(self):
         t = Transport([{}], randomize_hosts=False)
@@ -98,7 +98,7 @@ class TestTransport(TestCase):
 
         t.sniff_hosts()
         self.assertEquals(1, len(t.connection_pool.connections))
-        self.assertTrue(connection is t.get_connection())
+        self.assertIs(connection, t.get_connection())
 
     def test_sniff_on_fail_triggers_sniffing_on_fail(self):
         t = Transport([{'exception': ConnectionError('abandon ship')}, {"data": CLUSTER_NODES}],
@@ -115,7 +115,7 @@ class TestTransport(TestCase):
         for _ in range(4):
             t.perform_request('GET', '/')
         self.assertEquals(1, len(t.connection_pool.connections))
-        self.assertTrue(isinstance(t.get_connection(), DummyConnection))
+        self.assertIsInstance(t.get_connection(), DummyConnection)
         t.last_sniff = time.time() - 5.1
 
         t.perform_request('GET', '/')