From 9632b35abebc0e57ae851a8fb2c2a899c9009b4f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 13:19:15 -0400 Subject: [PATCH] Fix mismerge: Put Py3 warning back --- src/allmydata/scripts/runner.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index d48dd1395..ba979fdfa 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -221,6 +221,9 @@ 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(configFactory=Options, argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr): """ Run a Tahoe-LAFS node. @@ -235,6 +238,8 @@ def run(configFactory=Options, argv=sys.argv, stdout=sys.stdout, stderr=sys.stde :raise SystemExit: Always raised after the run is complete. """ + if six.PY3: + print(PYTHON_3_WARNING, file=sys.stderr) if sys.platform == "win32": from allmydata.windows.fixups import initialize initialize()