- LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue
  with "bin/zopectl adduser"

doc/CHANGES.rst

@@ -47,3 +47,5 @@ Features Added
 Bugs Fixed
 ++++++++++
 
+- LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue
+  with "bin/zopectl adduser"

src/Zope2/Startup/zopectl.py

@@ -129,7 +129,7 @@ class ZopeCtlOptions(ZDOptions):
             self.sockname = config.runner.socket_name
         else:
             self.sockname = os.path.join(self.clienthome, "zopectlsock")
-        self.python = config.python or sys.executable
+        self.python = os.environ.get('PYTHON', config.python) or sys.executable
         self.zdrun = os.path.join(os.path.dirname(zdaemon.__file__),
                                   "zdrun.py")
         if WIN:

src/Zope2/utilities/skel/bin/zopectl.in

@@ -4,6 +4,7 @@ PYTHON="<<PYTHON>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
 export INSTANCE_HOME
+export PYTHON
 
 ZDCTL="<<ZOPE2PATH>>/Startup/zopectl.py"