tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Fix mismerge: Put Py3 warning back

This commit is contained in:
Jean-Paul Calderone 2021-08-11 13:19:15 -04:00
parent 15312009ce
commit 9632b35abe
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/scripts/runner.py
View File

@ -221,6 +221,9 @@ def _maybe_enable_eliot_logging(options, reactor):
# Pass on the options so we can dispatch the subcommand. # Pass on the options so we can dispatch the subcommand.
return options 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): def run(configFactory=Options, argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
""" """
Run a Tahoe-LAFS node. 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. :raise SystemExit: Always raised after the run is complete.
""" """
if six.PY3:
print(PYTHON_3_WARNING, file=sys.stderr)
if sys.platform == "win32": if sys.platform == "win32":
from allmydata.windows.fixups import initialize from allmydata.windows.fixups import initialize
initialize() initialize()