diff options
| author | Brian May <brian@linuxpenguins.xyz> | 2020-06-11 09:55:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 09:55:36 +1000 |
| commit | a53f026056fee32a9af22e19ebb528a34e9f0d3e (patch) | |
| tree | 237f0d1775efcc90b8019a5184b08da79e7fcfed | |
| parent | 0a36eac6863fc6db6fb8d815325da8b122c82b08 (diff) | |
| parent | ae4c7e3a7bdbb628e8cbb1b2f2adcaa4d529edf4 (diff) | |
Merge pull request #461 from joshuarli/doc/update-py2-removal
doc: py2 removal clean sweep
| -rw-r--r-- | docs/manpage.rst | 2 | ||||
| -rw-r--r-- | docs/requirements.rst | 5 | ||||
| -rw-r--r-- | sshuttle/ssnet.py | 3 |
3 files changed, 3 insertions, 7 deletions
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. 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 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 |