Merge pull request #6997 from frenzymadness/future_is_now

Future is now

.bbtravis.yml

@@ -50,12 +50,10 @@ matrix:
     - env: PYTHON=3.9 TWISTED=latest SQLALCHEMY=latest TESTS=interop WORKER_PYTHON=3.7
     - env: PYTHON=3.9 TWISTED=latest SQLALCHEMY=latest TESTS=interop WORKER_PYTHON=3.6
     - env: PYTHON=3.9 TWISTED=latest SQLALCHEMY=latest TESTS=interop WORKER_PYTHON=3.5
-    - env: PYTHON=3.9 TWISTED=latest SQLALCHEMY=latest TESTS=interop WORKER_PYTHON=2.7
 
     # Worker tests on python and twisted package combinations.
     # We support worker on Python 2.7, on which Twisted 20.3.0 is the last version that works
     - env: PYTHON=3.9 TWISTED=18.7.0 SQLALCHEMY=latest TESTS=trial_worker
-    - env: PYTHON=2.7 TWISTED=20.3.0 SQLALCHEMY=latest TESTS=trial_worker
 
     # Configuration when SQLite database is persistent between running tests
     # (by default in other tests in-memory SQLite database is used which is

.isort.cfg

@@ -1,6 +1,6 @@
 [settings]
 line_length=110
-known_future_library=__future__,future
+known_future_library=__future__
 known_standard_library=html
 known_twisted=twisted,zope,autobahn,klein,txaio
 known_mock=mock

master/buildbot/changes/changes.py

@@ -13,7 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
-import html  # py2: via future
+import html
 import time
 
 from twisted.internet import defer

master/buildbot/test/integration/test_upgrade.py

@@ -80,8 +80,6 @@ def setUpUpgradeTest(self):
                     tf.extract(inf)
                     prefixes.add(inf.name.split('/', 1)[0])
 
-            # (note that tf.extractall isn't available in py2.4)
-
             # get the top-level dir from the tarball
             assert len(prefixes) == 1, "tarball has multiple top-level dirs!"
             self.basedir = prefixes.pop()

master/buildbot/worker/upcloud.py

@@ -14,10 +14,6 @@
 # Copyright Buildbot Team Members
 # -*- Coding: utf-8 -*-
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import hashlib
 import socket
 

newsfragments/worker-python27.removal

@@ -0,0 +1,2 @@
+Removed Python 2.7 support on the worker. This does not affect compatibility of connecting workers
+running old versions of Buildbot to masters running new versions of Buildbot.

pyinstaller/buildbot-worker.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-
 from buildbot_worker.scripts.runner import run
 
 run()

requirements-ci.txt

@@ -48,7 +48,6 @@ docutils==0.18.1  # pyup: ignore (sphinx-rtd-theme 1.2.0 requires docutils<0.19)
 extras==1.0.0
 fixtures==4.1.0
 funcsigs==1.0.2
-future==0.18.3
 graphql-core==3.2.3
 greenlet==3.0.1
 hvac==1.2.1

worker/buildbot_worker/__init__.py

@@ -18,9 +18,6 @@
 # We can't put this method in utility modules, because they import dependency packages
 #
 
-from __future__ import division
-from __future__ import print_function
-
 import datetime
 import os
 import re

worker/buildbot_worker/base.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import multiprocessing
 import os.path
 import socket

worker/buildbot_worker/bot.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from buildbot_worker.null import LocalWorker
 from buildbot_worker.pb import Worker
 

worker/buildbot_worker/commands/base.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from twisted.internet import defer
 from twisted.internet import reactor
 from twisted.python import log

worker/buildbot_worker/commands/fs.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import glob
 import os
 import platform

worker/buildbot_worker/commands/registry.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import buildbot_worker.commands.fs
 import buildbot_worker.commands.shell
 import buildbot_worker.commands.transfer

worker/buildbot_worker/commands/shell.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from buildbot_worker import runprocess
 from buildbot_worker.commands import base
 

worker/buildbot_worker/commands/transfer.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import os
 import tarfile
 import tempfile
@@ -210,29 +207,24 @@ def start(self):
         # Create temporary archive
         fd, self.tarname = tempfile.mkstemp(prefix='buildbot-transfer-')
         self.fp = os.fdopen(fd, "rb+")
-
         if self.compress == 'bz2':
             mode = 'w|bz2'
         elif self.compress == 'gz':
             mode = 'w|gz'
         else:
             mode = 'w'
-        # TODO: Use 'with' when depending on Python 2.7
-        # Not possible with older versions:
-        # exceptions.AttributeError: 'TarFile' object has no attribute '__exit__'
-        archive = tarfile.open(mode=mode, fileobj=self.fp)
-        try:
-            archive.add(self.path, '')
-        except OSError as e:
-            # if directory does not exist, bail out with an error
-            self.stderr = "Cannot read directory '{0}' for upload: {1}".format(self.path, e)
-            self.rc = 1
-            archive.close()
-            d = defer.succeed(False)
-            d.addCallback(self.finished)
-            return d
 
-        archive.close()
+        with tarfile.open(mode=mode, fileobj=self.fp) as archive:
+            try:
+                archive.add(self.path, '')
+            except OSError as e:
+                # if directory does not exist, bail out with an error
+                self.stderr = "Cannot read directory '{0}' for upload: {1}".format(self.path, e)
+                self.rc = 1
+                archive.close()  # need to close it before self.finished() runs below
+                d = defer.succeed(False)
+                d.addCallback(self.finished)
+                return d
 
         # Transfer it
         self.fp.seek(0)

worker/buildbot_worker/commands/utils.py

@@ -13,10 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-from future.utils import text_type
-
 import os
 
 from twisted.python import log
@@ -67,9 +63,9 @@ def rmdirRecursive(dir):
         # Thus, if a non-unicode-named dir contains a unicode filename, that filename will get
         # garbled.
         # So force dir to be unicode.
-        if not isinstance(dir, text_type):
+        if not isinstance(dir, str):
             try:
-                dir = text_type(dir, "utf-8")
+                dir = str(dir, "utf-8")
             except UnicodeDecodeError:
                 log.err("rmdirRecursive: decoding from UTF-8 failed (ignoring)")
 

worker/buildbot_worker/compat.py

@@ -19,20 +19,7 @@
 between Python 2 and Python 3.
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
-from future.utils import text_type
-
-if str != bytes:
-    # On Python 3 and higher, str and bytes
-    # are not equivalent.  We must use StringIO for
-    # doing io on native strings.
-    from io import StringIO as NativeStringIO
-else:
-    # On Python 2 and older, str and bytes
-    # are equivalent.  We must use BytesIO for
-    # doing io on native strings.
-    from io import BytesIO as NativeStringIO
+from io import StringIO as NativeStringIO
 
 
 def bytes2NativeString(x, encoding='utf-8'):
@@ -60,13 +47,12 @@ def unicode2bytes(x, encoding='utf-8', errors='strict'):
     """
     Convert a unicode string to C{bytes}.
 
-    @param x: a unicode string, of type C{unicode} on Python 2,
-              or C{str} on Python 3.
+    @param x: a unicode string, of type C{str}.
     @param encoding: an optional codec, default: 'utf-8'
     @param errors: error handling scheme, default 'strict'
     @return: a string of type C{bytes}
     """
-    if isinstance(x, text_type):
+    if isinstance(x, str):
         x = x.encode(encoding, errors)
     return x
 
@@ -75,16 +61,15 @@ def bytes2unicode(x, encoding='utf-8', errors='strict'):
     """
     Convert a C{bytes} to a unicode string.
 
-    @param x: a unicode string, of type C{unicode} on Python 2,
-              or C{str} on Python 3.
+    @param x: a unicode string, of type C{str}.
     @param encoding: an optional codec, default: 'utf-8'
     @param errors: error handling scheme, default 'strict'
     @return: a unicode string of type C{unicode} on Python 2, or
              C{str} on Python 3.
     """
-    if isinstance(x, (text_type, type(None))):
+    if isinstance(x, (str, type(None))):
         return x
-    return text_type(x, encoding, errors)
+    return str(x, encoding, errors)
 
 
 __all__ = [

worker/buildbot_worker/exceptions.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 
 class AbandonChain(Exception):
 

worker/buildbot_worker/interfaces.py

@@ -18,9 +18,6 @@
 # pylint: disable=no-method-argument
 # pylint: disable=inherit-non-class
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from zope.interface import Interface
 
 

worker/buildbot_worker/monkeypatches/testcase_assert.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import unittest
 
 

worker/buildbot_worker/msgpack.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import base64
 
 import msgpack

worker/buildbot_worker/null.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from twisted.internet import defer
 
 from buildbot_worker.base import WorkerBase

worker/buildbot_worker/pb.py

@@ -13,9 +13,6 @@
 #
 # Copyright Buildbot Team Members
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import os.path
 import shutil
 import signal

worker/buildbot_worker/pbutil.py

@@ -17,10 +17,6 @@
 """Base classes handy for use with PB clients.
 """
 
-from __future__ import absolute_import
-from __future__ import print_function
-from future.utils import iteritems
-
 from twisted.application.internet import backoffPolicy
 from twisted.cred import error
 from twisted.internet import defer
@@ -153,6 +149,6 @@ def decode(data, encoding='utf-8', errors='strict'):
         return bytes2unicode(data, encoding, errors)
     if data_type in (dict, list, tuple):
         if data_type == dict:
-            data = iteritems(data)
+            data = data.items()
         return data_type(map(decode, data))
     return data