Removed support for python 2.6

bjmb · bjmb · commit d9667444520c · 2017-01-18T18:02:19.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,6 @@ language: python
 python: 2.7
 sudo: false
 env:
-  - TOX_ENV=py26 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
-  - TOX_ENV=py26 CASS_VER=21
   - TOX_ENV=py27 CASS_VER=12 CASS_DRIVER_NO_CYTHON=1
   - TOX_ENV=py27 CASS_VER=20 CASS_DRIVER_NO_CYTHON=1
   - TOX_ENV=py27 CASS_VER=21 CASS_DRIVER_NO_CYTHON=1
diff --git a/README-dev.rst b/README-dev.rst
@@ -117,7 +117,7 @@ it with the ``PROTOCOL_VERSION`` environment variable::
 
 Testing Multiple Python Versions
 --------------------------------
-If you want to test all of python 2.6, 2.7, and pypy, use tox (this is what
+If you want to test all of python 2.7, 3.3, 3.4 and pypy, use tox (this is what
 TravisCI runs)::
 
     tox
diff --git a/README.rst b/README.rst
@@ -6,7 +6,7 @@ DataStax Python Driver for Apache Cassandra
 
 A modern, `feature-rich <https://github.com/datastax/python-driver#features>`_ and highly-tunable Python client library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using exclusively Cassandra's binary protocol and Cassandra Query Language v3.
 
-The driver supports Python 2.6, 2.7, 3.3, and 3.4.
+The driver supports Python 2.7, 3.3, and 3.4.
 
 Feedback Requested
 ------------------
diff --git a/cassandra/marshal.py b/cassandra/marshal.py
@@ -68,20 +68,12 @@ def varint_unpack(term):  # noqa
         return val
 
 
-def bitlength(n):
-    bitlen = 0
-    while n > 0:
-        n >>= 1
-        bitlen += 1
-    return bitlen
-
-
 def varint_pack(big):
     pos = True
     if big == 0:
         return b'\x00'
     if big < 0:
-        bytelength = bitlength(abs(big) - 1) // 8 + 1
+        bytelength = int.bit_length(abs(big) - 1) // 8 + 1
         big = (1 << bytelength * 8) + big
         pos = False
     revbytes = bytearray()
diff --git a/setup.py b/setup.py
@@ -417,7 +417,6 @@ def run_setup(extensions):
             'Natural Language :: English',
             'Operating System :: OS Independent',
             'Programming Language :: Python',
-            'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3.3',
             'Programming Language :: Python :: 3.4',
diff --git a/tests/unit/test_marshalling.py b/tests/unit/test_marshalling.py
@@ -14,7 +14,6 @@
 import sys
 
 from cassandra import ProtocolVersion
-from cassandra.marshal import bitlength
 
 try:
     import unittest2 as unittest
@@ -134,11 +133,6 @@ def test_marshalling(self):
                              msg='Marshaller for %s (%s) gave wrong type (%s instead of %s)'
                                  % (valtype, marshaller, type(whatwegot), type(serializedval)))
 
-    def test_bitlength(self):
-        self.assertEqual(bitlength(9), 4)
-        self.assertEqual(bitlength(-10), 0)
-        self.assertEqual(bitlength(0), 0)
-
     def test_date(self):
         # separate test because it will deserialize as datetime
         self.assertEqual(DateType.from_binary(DateType.to_binary(date(2015, 11, 2), 1), 1), datetime(2015, 11, 2))
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{26,27,33,34},pypy
+envlist = py{27,33,34},pypy
 
 [base]
 deps = nose
@@ -11,8 +11,7 @@ deps = nose
 [testenv]
 deps = {[base]deps}
        cython
-       py26: unittest2
-       py{26,27}: gevent
+       py{27}: gevent
        twisted <15.5.0
 setenv = LIBEV_EMBED=0
          CARES_EMBED=0
