PYTHON-1467 - PyMongo no longer supports Python 2.6

Author: behackett

.evergreen/config.yml

@@ -855,10 +855,11 @@ axes:
   - id: os-fully-featured
     display_name: OS
     values:
-      - id: linux-64-amzn-test
-        display_name: "Amazon Linux (Enterprise)"
-        run_on: linux-64-amzn-test
-        batchtime: 10080  # 7 days
+      # https://jira.mongodb.org/browse/BUILD-5453
+      #- id: linux-64-amzn-test
+      #  display_name: "Amazon Linux (Enterprise)"
+      #  run_on: linux-64-amzn-test
+      #  batchtime: 10080  # 7 days
 
       - id: ubuntu-14.04
         display_name: "Ubuntu 14.04"
@@ -1013,10 +1014,6 @@ axes:
   - id: python-version
     display_name: "Python"
     values:
-      - id: "2.6"
-        display_name: "Python 2.6"
-        variables:
-           PYTHON_BINARY: "/opt/python/2.6/bin/python"
       - id: "2.7"
         display_name: "Python 2.7"
         variables:
@@ -1061,10 +1058,6 @@ axes:
   - id: mod-wsgi-version
     display_name: "mod_wsgi version"
     values:
-      - id: "2"
-        display_name: "mod_wsgi 2.8"
-        variables:
-          MOD_WSGI_VERSION: "2"
       - id: "3"
         display_name: "mod_wsgi 3.5"
         variables:
@@ -1122,11 +1115,7 @@ axes:
     values:
       # There is (currently) no vs2008 distro. The Microsoft Visual
       # C++ Compiler for Python 2.7 has been installed, with CPython
-      # 2.6 and 2.7, on the vs2015 distro.
-      - id: "2.6"
-        display_name: "Python 2.6"
-        variables:
-           PYTHON_BINARY: "/cygdrive/c/python/Python26/python.exe"
+      # 2.7, on the vs2015 distro.
       - id: "2.7"
         display_name: "Python 2.7"
         variables:
@@ -1339,9 +1328,6 @@ buildvariants:
 # on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
 - matrix_name: "tests-windows-vs2015-python-version-27plus"
   matrix_spec: {windows-vs2015-python-version: "*", auth-ssl: "*"}
-  exclude_spec:
-   - windows-vs2015-python-version: "2.6"
-     auth-ssl: "*"
   display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth-ssl}"
   run_on: windows-64-vs2015-test
   tasks:
@@ -1353,51 +1339,6 @@ buildvariants:
      - ".3.0"
      - ".2.6"
 
-# Test CPython 2.6 against all versions on MongoDB >= 2.6
-# on Windows with the Microsoft Visual C++ Compiler for Python 2.7.
-# Python 2.6.6 (the last 2.6 version with Windows installers) bundles
-# OpenSSL 0.9.8, which doesn't support TLS 1.1+. MongoDB 4.0+ requires
-# TLS 1.1+ by default.
-- matrix_name: "tests-windows-vs2015-python-version-26"
-  matrix_spec: {windows-vs2015-python-version: "2.6", auth: "*", ssl: "*"}
-  exclude_spec:
-   - windows-vs2015-python-version: "*"
-     auth: "noauth"
-     ssl: "ssl"
-  display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth} ${ssl}"
-  run_on: windows-64-vs2015-test
-  rules:
-    - if:
-        windows-vs2015-python-version: "*"
-        auth: "*"
-        ssl: "nossl"
-      then:
-        add_tasks:
-          - ".latest"
-          - ".4.0"
-    - if:
-        windows-vs2015-python-version: "*"
-        auth: "noauth"
-        ssl: "nossl"
-      then:
-        add_tasks:
-          - ".3.6"
-          - ".3.4"
-          - ".3.2"
-          - ".3.0"
-          - ".2.6"
-    - if:
-        windows-vs2015-python-version: "*"
-        auth: "auth"
-        ssl: "ssl"
-      then:
-        add_tasks:
-          - ".3.6"
-          - ".3.4"
-          - ".3.2"
-          - ".3.0"
-          - ".2.6"
-
 # Storage engine tests on RHEL 6.2 (x86_64) with Python 2.7.
 - matrix_name: "tests-storage-engines"
   matrix_spec: {storage-engine: "*", python-version: "2.7"}
@@ -1453,11 +1394,7 @@ buildvariants:
      - name: "test-enterprise-auth"
 
 - matrix_name: "tests-mod-wsgi"
-  matrix_spec: {"python-version": ["2.6", "2.7", "3.4", "3.6"], "mod-wsgi-version": "*"}
-  exclude_spec:
-    # mod_wsgi 2.8 segfaults with the toolchain python 2.7, regardless of distro
-    python-version: ["2.7", "3.4", "3.6"]
-    mod-wsgi-version: ["2"]
+  matrix_spec: {"python-version": ["2.7", "3.4", "3.6"], "mod-wsgi-version": "*"}
   display_name: "${mod-wsgi-version} ${python-version}"
   run_on: rhel62-small
   tasks:
@@ -1479,7 +1416,7 @@ buildvariants:
      - name: "doctests"
 
 - matrix_name: "cdecimal"
-  matrix_spec: {python-version: ["2.6", "2.7"]}
+  matrix_spec: {python-version: ["2.7"]}
   display_name: "cdecimal ${python-version}"
   batchtime: 10080  # 7 days
   run_on:

.evergreen/run-atlas-tests.sh

@@ -7,24 +7,16 @@ export JAVA_HOME=/opt/java/jdk8
 
 IMPL=$(${PYTHON_BINARY} -c "import platform, sys; sys.stdout.write(platform.python_implementation())")
 PYTHON_VERSION=$(${PYTHON_BINARY} -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
-if [ $PYTHON_VERSION = "2.6" -o $IMPL = "Jython" ]; then
-    # TODO - When Jython has its own virtualenv install use it instead.
-    /opt/python/2.6/bin/virtualenv -p ${PYTHON_BINARY} --never-download --no-wheel atlastest
-    . atlastest/bin/activate
-    trap "deactivate; rm -rf atlastest" EXIT HUP
-    pip install certifi
-    if [ $PYTHON_VERSION = "2.6" ]; then
-        pip install unittest2
-    fi
-    PYTHON=python
-elif [ $IMPL = "PyPy" -a $PYTHON_VERSION = "3.2" ]; then
+if [ $IMPL = "Jython" -o $IMPL = "PyPy" ]; then
     $PYTHON_BINARY -m virtualenv --never-download --no-wheel atlastest
     . atlastest/bin/activate
     trap "deactivate; rm -rf atlastest" EXIT HUP
     pip install certifi
-    # Portable pypy3.2 can't load CA certs from the system.
-    # https://github.com/squeaky-pl/portable-pypy/issues/15
-    export SSL_CERT_FILE=$(python -c "import certifi; print(certifi.where())")
+    if [ $PYTHON_VERSION = "3.2" ]; then
+        # Portable pypy3.2 can't load CA certs from the system.
+        # https://github.com/squeaky-pl/portable-pypy/issues/15
+        export SSL_CERT_FILE=$(python -c "import certifi; print(certifi.where())")
+    fi
     PYTHON=python
 else
     PYTHON=$PYTHON_BINARY

.evergreen/run-tests.sh

@@ -44,10 +44,7 @@ if [ -z "$PYTHON_BINARY" ]; then
             exit 1
         fi
     else
-        # wheel and pip are dropping support for Python 2.6. Avoid virtualenv
-        # automatically upgrading its bundled versions to new versions that
-        # might fail in 2.6.
-        $VIRTUALENV --no-download pymongotestvenv || $VIRTUALENV pymongotestvenv
+        $VIRTUALENV pymongotestvenv
         . pymongotestvenv/bin/activate
         PYTHON=python
         trap "deactivate; rm -rf pymongotestvenv" EXIT HUP

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 
 python:
-  - 2.6
   - 2.7
   - 3.4
   - 3.5

CONTRIBUTING.rst

@@ -19,7 +19,7 @@ that might not be of interest or that has already been addressed.
 Supported Interpreters
 ----------------------
 
-PyMongo supports CPython 2.6, 2.7, 3.4+, PyPy, and PyPy3. Language
+PyMongo supports CPython 2.7, 3.4+, PyPy, and PyPy3. Language
 features not supported by all interpreters can not be used.
 
 Style Guide

README.rst

@@ -88,7 +88,7 @@ is incompatible with PyMongo.
 Dependencies
 ============
 
-PyMongo supports CPython 2.6, 2.7, 3.4+, PyPy, and PyPy3.
+PyMongo supports CPython 2.7, 3.4+, PyPy, and PyPy3.
 
 Optional dependencies:
 
@@ -136,7 +136,6 @@ Other optional packages:
 Additional dependencies are:
 
 - (to generate documentation) sphinx_
-- (to run the tests under Python 2.6) unittest2_
 
 Examples
 ========
@@ -188,8 +187,7 @@ Testing
 =======
 
 The easiest way to run the tests is to run **python setup.py test** in
-the root of the distribution. Note that you will need unittest2_ to
-run the tests under Python 2.6.
+the root of the distribution.
 
 To verify that PyMongo works with Gevent's monkey-patching::
 
@@ -200,4 +198,3 @@ Or with Eventlet's::
     $ python green_framework_test.py eventlet
 
 .. _sphinx: http://sphinx.pocoo.org/
-.. _unittest2: https://pypi.python.org/pypi/unittest2

RELEASE.rst

@@ -31,9 +31,9 @@ that changes the major version number.
 Doing a Release
 ---------------
 
-1. Test releases on Python 2.6-2.7 and 3.4+ on Windows, Linux and OSX,
+1. Test releases on Python 2.7 and 3.4+ on Windows, Linux and OSX,
    with and without the C extensions. It's generally enough to just run the
-   tests on 2.6, 2.7, 3.4 and the latest 3.x version with and without the
+   tests on 2.7, 3.4 and the latest 3.x version with and without the
    extensions on a single platform, and then just test any version on the
    other platforms as a sanity check. `python setup.py test` will build the
    extensions and test. `python tools/clean.py` will remove the extensions,

bson/decimal128.py

@@ -35,21 +35,6 @@ def _from_bytes(value, dummy, _int=int, _hexlify=binascii.hexlify):
         "An implementation of int.from_bytes for python 2.x."
         return _int(_hexlify(value), 16)
 
-if sys.version_info[:2] == (2, 6):
-    def _bit_length(num):
-        """bit_length for python 2.6"""
-        if num:
-            # bin() was new in 2.6. Note that this won't work
-            # for values less than 0, which we never have here.
-            return len(bin(num)) - 2
-        # bit_length(0) is 0, but len(bin(0)) - 2 is 1
-        return 0
-else:
-    def _bit_length(num):
-        """bit_length for python >= 2.7"""
-        # num could be int or long in python 2.7
-        return num.bit_length()
-
 
 _PACK_64 = struct.Struct("<Q").pack
 _UNPACK_64 = struct.Struct("<Q").unpack
@@ -126,7 +111,7 @@ def _decimal_to_128(value):
         return _NNAN if value.is_signed() else _PNAN
 
     significand = int("".join([str(digit) for digit in digits]))
-    bit_length = _bit_length(significand)
+    bit_length = significand.bit_length()
 
     high = 0
     low = 0
@@ -298,10 +283,9 @@ def to_decimal(self):
         mask = 0x0001000000000000
         arr[0] = (high & mask) >> 48
 
-        # Have to convert bytearray to bytes for python 2.6.
         # cdecimal only accepts a tuple for digits.
         digits = tuple(
-            int(digit) for digit in str(_from_bytes(bytes(arr), 'big')))
+            int(digit) for digit in str(_from_bytes(arr, 'big')))
 
         with decimal.localcontext(_DEC128_CTX) as ctx:
             return ctx.create_decimal((sign, digits, exponent))

bson/json_util.py

@@ -107,21 +107,12 @@
 
 import base64
 import datetime
+import json
 import math
 import re
 import sys
 import uuid
 
-if sys.version_info[:2] == (2, 6):
-    # In Python 2.6, json does not include object_pairs_hook. Use simplejson
-    # instead.
-    try:
-        import simplejson as json
-    except ImportError:
-        import json
-else:
-    import json
-
 from pymongo.errors import ConfigurationError
 
 import bson
@@ -143,13 +134,6 @@
 from bson.tz_util import utc
 
 
-try:
-    json.loads("{}", object_pairs_hook=dict)
-    _HAS_OBJECT_PAIRS_HOOK = True
-except TypeError:
-    _HAS_OBJECT_PAIRS_HOOK = False
-
-
 _RE_OPT_TABLE = {
     "i": re.I,
     "l": re.L,
@@ -245,10 +229,6 @@ class JSONMode:
 class JSONOptions(CodecOptions):
     """Encapsulates JSON options for :func:`dumps` and :func:`loads`.
 
-    Raises :exc:`~pymongo.errors.ConfigurationError` on Python 2.6 if
-    `simplejson >= 2.1.0 <https://pypi.python.org/pypi/simplejson>`_ is not
-    installed and document_class is not the default (:class:`dict`).
-
     :Parameters:
       - `strict_number_long`: If ``True``, :class:`~bson.int64.Int64` objects
         are encoded to MongoDB Extended JSON's *Strict mode* type
@@ -301,11 +281,6 @@ def __new__(cls, strict_number_long=False,
                 "JSONOptions.datetime_representation must be one of LEGACY, "
                 "NUMBERLONG, or ISO8601 from DatetimeRepresentation.")
         self = super(JSONOptions, cls).__new__(cls, *args, **kwargs)
-        if not _HAS_OBJECT_PAIRS_HOOK and self.document_class != dict:
-            raise ConfigurationError(
-                "Support for JSONOptions.document_class on Python 2.6 "
-                "requires simplejson >= 2.1.0"
-                "(https://pypi.python.org/pypi/simplejson) to be installed.")
         if json_mode not in (JSONMode.LEGACY,
                              JSONMode.RELAXED,
                              JSONMode.CANONICAL):
@@ -430,11 +405,8 @@ def loads(s, *args, **kwargs):
        Accepts optional parameter `json_options`. See :class:`JSONOptions`.
     """
     json_options = kwargs.pop("json_options", DEFAULT_JSON_OPTIONS)
-    if _HAS_OBJECT_PAIRS_HOOK:
-        kwargs["object_pairs_hook"] = lambda pairs: object_pairs_hook(
-            pairs, json_options)
-    else:
-        kwargs["object_hook"] = lambda obj: object_hook(obj, json_options)
+    kwargs["object_pairs_hook"] = lambda pairs: object_pairs_hook(
+        pairs, json_options)
     return json.loads(s, *args, **kwargs)
 
 

bson/py3compat.py

@@ -36,7 +36,7 @@
     def b(s):
         # BSON and socket operations deal in binary data. In
         # python 3 that means instances of `bytes`. In python
-        # 2.6 and 2.7 you can create an alias for `bytes` using
+        # 2.7 you can create an alias for `bytes` using
         # the b prefix (e.g. b'foo').
         # See http://python3porting.com/problems.html#nicer-solutions
         return codecs.latin_1_encode(s)[0]