|
|
@ -26,17 +26,18 @@
|
|
|
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
# POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
# POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
|
|
|
|
|
|
|
import re
|
|
|
|
import getpass
|
|
|
|
|
|
|
|
import inspect
|
|
|
|
import logging
|
|
|
|
import logging
|
|
|
|
import os
|
|
|
|
import os
|
|
|
|
import termios
|
|
|
|
import re
|
|
|
|
import signal
|
|
|
|
|
|
|
|
import select
|
|
|
|
import select
|
|
|
|
import getpass
|
|
|
|
import signal
|
|
|
|
import time
|
|
|
|
|
|
|
|
import socket
|
|
|
|
import socket
|
|
|
|
import inspect
|
|
|
|
import sys
|
|
|
|
|
|
|
|
import termios
|
|
|
|
import textwrap
|
|
|
|
import textwrap
|
|
|
|
|
|
|
|
import time
|
|
|
|
import zlib
|
|
|
|
import zlib
|
|
|
|
|
|
|
|
|
|
|
|
import mitogen.core
|
|
|
|
import mitogen.core
|
|
|
@ -289,6 +290,11 @@ class Stream(mitogen.core.Stream):
|
|
|
|
super(Stream, self).construct(**kwargs)
|
|
|
|
super(Stream, self).construct(**kwargs)
|
|
|
|
if python_path:
|
|
|
|
if python_path:
|
|
|
|
self.python_path = python_path
|
|
|
|
self.python_path = python_path
|
|
|
|
|
|
|
|
if sys.platform == 'darwin' and self.python_path == '/usr/bin/python':
|
|
|
|
|
|
|
|
# OS X installs a craptacular argv0-introspecting Python version
|
|
|
|
|
|
|
|
# switcher as /usr/bin/python. Override attempts to call it with an
|
|
|
|
|
|
|
|
# explicit call to python2.7
|
|
|
|
|
|
|
|
self.python_path = '/usr/bin/python2.7'
|
|
|
|
if connect_timeout:
|
|
|
|
if connect_timeout:
|
|
|
|
self.connect_timeout = connect_timeout
|
|
|
|
self.connect_timeout = connect_timeout
|
|
|
|
if remote_name is None:
|
|
|
|
if remote_name is None:
|
|
|
|