From e56f8f234954b10a3dd83f70b375923486140633 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 10 Jun 2020 16:46:10 -0700 Subject: server side is py3.5+ --- docs/requirements.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/requirements.rst b/docs/requirements.rst index 0631d66..27072b4 100644 --- a/docs/requirements.rst +++ b/docs/requirements.rst @@ -57,9 +57,8 @@ cmd.exe with Administrator access. See :doc:`windows` for more information. Server side Requirements ------------------------ -The server can run in any version of Python between 2.4 and 3.6. -However it is recommended that you use Python 2.7, Python 3.5 or later whenever -possible as support for older versions might be dropped in the future. + +- Python 3.5 or greater. Additional Suggested Software -- cgit v1.2.3 From 61bbbca956ef9d525c43ce572c8e64f4a5f06aec Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 10 Jun 2020 16:46:52 -0700 Subject: another python 3.5 change --- docs/manpage.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manpage.rst b/docs/manpage.rst index 8a5b09a..68845be 100644 --- a/docs/manpage.rst +++ b/docs/manpage.rst @@ -11,7 +11,7 @@ Description ----------- :program:`sshuttle` allows you to create a VPN connection from your machine to any remote server that you can connect to via -ssh, as long as that server has python 2.3 or higher. +ssh, as long as that server has python 3.5 or higher. To work, you must have root access on the local machine, but you can have a normal account on the server. -- cgit v1.2.3 From ae4c7e3a7bdbb628e8cbb1b2f2adcaa4d529edf4 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 10 Jun 2020 16:47:23 -0700 Subject: remove outdated comment --- sshuttle/ssnet.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/sshuttle/ssnet.py b/sshuttle/ssnet.py index 7604093..b97516e 100644 --- a/sshuttle/ssnet.py +++ b/sshuttle/ssnet.py @@ -10,15 +10,12 @@ from sshuttle.helpers import b, log, debug1, debug2, debug3, Fatal MAX_CHANNEL = 65535 LATENCY_BUFFER_SIZE = 32768 -# these don't exist in the socket module in python 2.3! SHUT_RD = 0 SHUT_WR = 1 SHUT_RDWR = 2 - HDR_LEN = 8 - CMD_EXIT = 0x4200 CMD_PING = 0x4201 CMD_PONG = 0x4202 -- cgit v1.2.3