From 342a1c2c31ead596cb705a30e69282ad28df9932 Mon Sep 17 00:00:00 2001 From: fenn-cs Date: Sun, 29 Aug 2021 16:10:30 +0100 Subject: [PATCH] Python 3 support complete, so removed warning Signed-off-by: fenn-cs --- newsfragments/3781.minor | 0 src/allmydata/scripts/runner.py | 5 ----- src/allmydata/test/test_system.py | 8 ++------ 3 files changed, 2 insertions(+), 11 deletions(-) create mode 100644 newsfragments/3781.minor diff --git a/newsfragments/3781.minor b/newsfragments/3781.minor new file mode 100644 index 000000000..e69de29bb diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index 7f7f88bf6..a42b30624 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -183,13 +183,8 @@ def _maybe_enable_eliot_logging(options, reactor): # Pass on the options so we can dispatch the subcommand. return options -PYTHON_3_WARNING = ("Support for Python 3 is an incomplete work-in-progress." - " Use at your own risk.") def run(): - if six.PY3: - print(PYTHON_3_WARNING, file=sys.stderr) - if sys.platform == "win32": from allmydata.windows.fixups import initialize initialize() diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 627b6ef29..d61d6990b 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -43,7 +43,6 @@ from allmydata.monitor import Monitor from allmydata.mutable.common import NotWriteableError from allmydata.mutable import layout as mutable_layout from allmydata.mutable.publish import MutableData -from allmydata.scripts.runner import PYTHON_3_WARNING from foolscap.api import DeadReferenceError, fireEventually, flushEventualQueue from twisted.python.failure import Failure @@ -2632,18 +2631,16 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase): newargs = ["--node-directory", self.getdir("client0"), verb] + list(args) return self.run_bintahoe(newargs, stdin=stdin, env=env) - def _check_succeeded(res, check_stderr=True): + def _check_succeeded(res): out, err, rc_or_sig = res self.failUnlessEqual(rc_or_sig, 0, str(res)) - if check_stderr: - self.assertIn(err.strip(), (b"", PYTHON_3_WARNING.encode("ascii"))) d.addCallback(_run_in_subprocess, "create-alias", "newalias") d.addCallback(_check_succeeded) STDIN_DATA = b"This is the file to upload from stdin." d.addCallback(_run_in_subprocess, "put", "-", "newalias:tahoe-file", stdin=STDIN_DATA) - d.addCallback(_check_succeeded, check_stderr=False) + d.addCallback(_check_succeeded) def _mv_with_http_proxy(ign): env = os.environ @@ -2656,7 +2653,6 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase): def _check_ls(res): out, err, rc_or_sig = res self.failUnlessEqual(rc_or_sig, 0, str(res)) - self.assertIn(err.strip(), (b"", PYTHON_3_WARNING.encode("ascii"))) self.failUnlessIn(b"tahoe-moved", out) self.failIfIn(b"tahoe-file", out) d.addCallback(_check_ls)