Drop Python 2

Author: alex

.github/workflows/ci.yml

@@ -15,7 +15,6 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - {VERSION: "2.7", TOXENV: "py27", EXTRA_CFLAGS: ""}
           - {VERSION: "3.6", TOXENV: "py36", EXTRA_CFLAGS: ""}
           - {VERSION: "3.9", TOXENV: "py39", EXTRA_CFLAGS: "-DUSE_OSRANDOM_RNG_FOR_TESTING"}
     name: "Python ${{ matrix.PYTHON.VERSION }} on macOS"
@@ -58,7 +57,6 @@ jobs:
           - {ARCH: 'x86', WINDOWS: 'win32'}
           - {ARCH: 'x64', WINDOWS: 'win64'}
         PYTHON:
-          - {VERSION: "2.7", TOXENV: "py27", MSVC_VERSION: "2010", CL_FLAGS: ""}
           - {VERSION: "3.6", TOXENV: "py36", MSVC_VERSION: "2019", CL_FLAGS: ""}
           - {VERSION: "3.7", TOXENV: "py37", MSVC_VERSION: "2019", CL_FLAGS: ""}
           - {VERSION: "3.8", TOXENV: "py38", MSVC_VERSION: "2019", CL_FLAGS: ""}
@@ -72,13 +70,6 @@ jobs:
           python-version: ${{ matrix.PYTHON.VERSION }}
           architecture: ${{ matrix.WINDOWS.ARCH }}
 
-      - name: Install MSVC for Python 2.7
-        run: |
-            Invoke-WebRequest -Uri https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -OutFile VCForPython27.msi
-            Start-Process msiexec -Wait -ArgumentList @('/i', 'VCForPython27.msi', '/qn', 'ALLUSERS=1')
-            Remove-Item VCForPython27.msi -Force
-        shell: powershell
-        if: matrix.PYTHON.VERSION == '2.7'
       - run: python -m pip install tox requests coverage
       - name: Download OpenSSL
         run: |

.github/workflows/wheel-builder.yml

@@ -11,7 +11,7 @@ jobs:
     container: ${{ matrix.MANYLINUX.CONTAINER }}
     strategy:
       matrix:
-        PYTHON: ["cp27-cp27m", "cp27-cp27mu", "cp36-cp36m"]
+        PYTHON: ["cp36-cp36m"]
         MANYLINUX:
           - NAME: manylinux1_x86_64
             CONTAINER: "pyca/cryptography-manylinux1:x86_64"
@@ -57,10 +57,6 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - VERSION: '2.7'
-            ABI_VERSION: '2.7'
-            DOWNLOAD_URL: 'https://www.python.org/ftp/python/2.7.17/python-2.7.17-macosx10.9.pkg'
-            BIN_PATH: '/Library/Frameworks/Python.framework/Versions/2.7/bin/python'
           - VERSION: '3.8'
             ABI_VERSION: '3.6'
             DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.8.2/python-3.8.2-macosx10.9.pkg'
@@ -114,7 +110,6 @@ jobs:
           - {ARCH: 'x86', WINDOWS: 'win32'}
           - {ARCH: 'x64', WINDOWS: 'win64'}
         PYTHON:
-          - {VERSION: "2.7", MSVC_VERSION: "2010"}
           - {VERSION: "3.6", MSVC_VERSION: "2019"}
           - {VERSION: "3.7", MSVC_VERSION: "2019"}
           - {VERSION: "3.8", MSVC_VERSION: "2019"}
@@ -127,13 +122,6 @@ jobs:
         with:
           python-version: ${{ matrix.PYTHON.VERSION }}
           architecture: ${{ matrix.WINDOWS.ARCH }}
-      - name: Install MSVC for Python 2.7
-        run: |
-            Invoke-WebRequest -Uri https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -OutFile VCForPython27.msi
-            Start-Process msiexec -Wait -ArgumentList @('/i', 'VCForPython27.msi', '/qn', 'ALLUSERS=1')
-            Remove-Item VCForPython27.msi -Force
-        shell: powershell
-        if: matrix.PYTHON.VERSION == '2.7'
       - run: pip install requests
       - name: Download OpenSSL
         run: |

.travis.yml

@@ -27,18 +27,10 @@ matrix:
           env: TOXENV=py39
           # Travis lists available Pythons (including PyPy) by arch and distro here:
           # https://docs.travis-ci.com/user/languages/python/#python-versions
-        - python: pypy2.7-7.3.1
-          env: TOXENV=pypy-nocoverage
         - python: pypy3.6-7.3.1
           env: TOXENV=pypy3-nocoverage
-        - python: 2.7
-          env: TOXENV=py27 OPENSSL=1.1.0l
-        - python: 2.7
-          env: TOXENV=py27-ssh OPENSSL=1.1.0l
         - python: 3.8
           env: TOXENV=py38 OPENSSL=1.1.0l
-        - python: 2.7
-          env: TOXENV=py27 OPENSSL=1.1.1h
         - python: 3.8
           env: TOXENV=py38 OPENSSL=1.1.1h
         - python: 3.8
@@ -54,18 +46,12 @@ matrix:
         - python: 3.8
           env: TOXENV=py38 LIBRESSL=3.2.2
 
-        - python: 2.7
-          services: docker
-          env: TOXENV=py27 DOCKER=pyca/cryptography-runner-centos8
         - python: 3.6
           services: docker
           env: TOXENV=py36 DOCKER=pyca/cryptography-runner-centos8
         - python: 3.6
           services: docker
           env: TOXENV=py36 OPENSSL_FORCE_FIPS_MODE=1 DOCKER=pyca/cryptography-runner-centos8-fips
-        - python: 2.7
-          services: docker
-          env: TOXENV=py27 DOCKER=pyca/cryptography-runner-stretch
         - python: 3.7
           services: docker
           env: TOXENV=py37 DOCKER=pyca/cryptography-runner-buster
@@ -81,9 +67,6 @@ matrix:
         - python: 3.8
           services: docker
           env: TOXENV=py38 DOCKER=pyca/cryptography-runner-ubuntu-focal
-        - python: 2.7
-          services: docker
-          env: TOXENV=py27 DOCKER=pyca/cryptography-runner-ubuntu-rolling
         - python: 3.8
           services: docker
           env: TOXENV=py38 DOCKER=pyca/cryptography-runner-ubuntu-rolling

.travis/upload_coverage.sh

@@ -5,7 +5,6 @@ set -x
 
 if [ -n "${TOXENV}" ]; then
     case "${TOXENV}" in
-        pypy-nocoverage);;
         pypy3-nocoverage);;
         pep8);;
         py3pep8);;

.zuul.d/jobs.yaml

@@ -25,13 +25,6 @@
     vars:
       tox_envlist: py36
 
-- job:
-    name: pyca-cryptography-centos-8-py27-arm64
-    parent: pyca-cryptography-base
-    nodeset: centos-8-arm64
-    vars:
-      tox_envlist: py27
-
 - job:
     name: pyca-cryptography-build-wheel
     abstract: true
@@ -57,12 +50,8 @@
         - platform: manylinux1_x86_64
           image: pyca/cryptography-manylinux1:x86_64
           pythons:
-            - cp27-cp27m
-            - cp27-cp27mu
             - cp36-cp36m
         - platform: manylinux2010_x86_64
           image: pyca/cryptography-manylinux2010:x86_64
           pythons:
-            - cp27-cp27m
-            - cp27-cp27mu
             - cp36-cp36m

.zuul.d/project.yaml

@@ -6,7 +6,6 @@
         - pyca-cryptography-ubuntu-focal-py38-arm64
         - pyca-cryptography-ubuntu-bionic-py36-arm64
         - pyca-cryptography-centos-8-py36-arm64
-        - pyca-cryptography-centos-8-py27-arm64
     release:
       jobs:
         - pyca-cryptography-build-wheel-arm64

docs/installation.rst

@@ -10,8 +10,8 @@ You can install ``cryptography`` with ``pip``:
 Supported platforms
 -------------------
 
-Currently we test ``cryptography`` on Python 2.7, 3.6+,
-PyPy 7.3.1, and PyPy3 7.3.1 on these operating systems.
+Currently we test ``cryptography`` on Python 3.6+ and PyPy3 7.3.1 on these
+operating systems.
 
 * x86-64 CentOS 7.x
 * x86-64 & AArch64 CentOS 8.x
@@ -45,9 +45,9 @@ just run
 If you prefer to compile it yourself you'll need to have OpenSSL installed.
 You can compile OpenSSL yourself as well or use `a binary distribution`_.
 Be sure to download the proper version for your architecture and Python
-(VC2010 works for Python 2.7 while VC2015 is required for 3.6 and above).
-Wherever you place your copy of OpenSSL you'll need to set the ``LIB`` and ``INCLUDE``
-environment variables to include the proper locations. For example:
+(VC2015 is required for 3.6 and above). Wherever you place your copy of OpenSSL
+you'll need to set the ``LIB`` and ``INCLUDE`` environment variables to include
+the proper locations. For example:
 
 .. code-block:: console
 

pyproject.toml

@@ -11,4 +11,4 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 79
-target-version = ["py27"]
+target-version = ["py36"]

setup.py

@@ -73,8 +73,6 @@
         "Operating System :: POSIX :: Linux",
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
@@ -87,11 +85,10 @@
     package_dir={"": "src"},
     packages=find_packages(where="src", exclude=["_cffi_src", "_cffi_src.*"]),
     include_package_data=True,
-    python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
-    install_requires=["six >= 1.4.1"] + setup_requirements,
+    python_requires=">=3.6",
+    install_requires=setup_requirements,
     setup_requires=setup_requirements,
     extras_require={
-        ":python_version < '3'": ["enum34", "ipaddress"],
         "test": [
             "pytest>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2",
             "pretend",

src/cryptography/__init__.py

@@ -4,9 +4,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-import sys
-import warnings
-
 from cryptography.__about__ import (
     __author__,
     __copyright__,
@@ -17,7 +14,6 @@
     __uri__,
     __version__,
 )
-from cryptography.utils import CryptographyDeprecationWarning
 
 
 __all__ = [
@@ -30,12 +26,3 @@
     "__license__",
     "__copyright__",
 ]
-
-if sys.version_info[0] == 2:
-    warnings.warn(
-        "Python 2 is no longer supported by the Python core team. Support for "
-        "it is now deprecated in cryptography, and will be removed in a "
-        "future release.",
-        CryptographyDeprecationWarning,
-        stacklevel=2,
-    )

src/cryptography/fernet.py

@@ -10,8 +10,6 @@
 import struct
 import time
 
-import six
-
 from cryptography import utils
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.backends import _get_backend
@@ -97,7 +95,7 @@ def _get_unverified_token_data(token):
         except (TypeError, binascii.Error):
             raise InvalidToken
 
-        if not data or six.indexbytes(data, 0) != 0x80:
+        if not data or data[0] != 0x80:
             raise InvalidToken
 
         try:

src/cryptography/hazmat/_der.py

@@ -4,8 +4,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-import six
-
 from cryptography.utils import int_from_bytes, int_to_bytes
 
 
@@ -53,7 +51,7 @@ def check_empty(self):
     def read_byte(self):
         if len(self.data) < 1:
             raise ValueError("Invalid DER input: insufficient data")
-        ret = six.indexbytes(self.data, 0)
+        ret = self.data[0]
         self.data = self.data[1:]
         return ret
 
@@ -111,20 +109,20 @@ def read_single_element(self, expected_tag):
             return self.read_element(expected_tag)
 
     def read_optional_element(self, expected_tag):
-        if len(self.data) > 0 and six.indexbytes(self.data, 0) == expected_tag:
+        if len(self.data) > 0 and self.data[0] == expected_tag:
             return self.read_element(expected_tag)
         return None
 
     def as_integer(self):
         if len(self.data) == 0:
             raise ValueError("Invalid DER input: empty integer contents")
-        first = six.indexbytes(self.data, 0)
+        first = self.data[0]
         if first & 0x80 == 0x80:
             raise ValueError("Negative DER integers are not supported")
         # The first 9 bits must not all be zero or all be ones. Otherwise, the
         # encoding should have been one byte shorter.
         if len(self.data) > 1:
-            second = six.indexbytes(self.data, 1)
+            second = self.data[1]
             if first == 0 and second & 0x80 == 0:
                 raise ValueError(
                     "Invalid DER input: integer not minimally-encoded"
@@ -133,7 +131,7 @@ def as_integer(self):
 
 
 def encode_der_integer(x):
-    if not isinstance(x, six.integer_types):
+    if not isinstance(x, int):
         raise ValueError("Value must be an integer")
     if x < 0:
         raise ValueError("Negative integers are not supported")
@@ -145,12 +143,12 @@ def encode_der(tag, *children):
     length = 0
     for child in children:
         length += len(child)
-    chunks = [six.int2byte(tag)]
+    chunks = [bytes([tag])]
     if length < 0x80:
-        chunks.append(six.int2byte(length))
+        chunks.append(bytes([length]))
     else:
         length_bytes = int_to_bytes(length)
-        chunks.append(six.int2byte(0x80 | len(length_bytes)))
+        chunks.append(bytes([0x80 | len(length_bytes)]))
         chunks.append(length_bytes)
     chunks.extend(children)
     return b"".join(chunks)