From bca1fe137ddde3e3ee8e7a9357fab5c84db3dc1f Mon Sep 17 00:00:00 2001 From: Matt Ford Date: Mon, 23 May 2016 10:02:16 +0100 Subject: [PATCH] Remove platform references --- sshuttle/client.py | 4 ---- sshuttle/firewall.py | 4 ---- sshuttle/hostwatch.py | 4 ---- sshuttle/server.py | 3 --- 4 files changed, 15 deletions(-) diff --git a/sshuttle/client.py b/sshuttle/client.py index d85ce08..a5ca0a6 100644 --- a/sshuttle/client.py +++ b/sshuttle/client.py @@ -10,7 +10,6 @@ import sshuttle.ssh as ssh import sshuttle.ssyslog as ssyslog import sys -import platform from sshuttle.ssnet import SockWrapper, Handler, Proxy, Mux, MuxWrapper from sshuttle.helpers import log, debug1, debug2, debug3, Fatal, islocal, \ resolvconf_nameservers @@ -402,9 +401,6 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename, python, latency_control, dns_listener, seed_hosts, auto_nets, daemon): - debug1('Starting client with Python version %s\n' - % platform.python_version()) - method = fw.method handlers = [] diff --git a/sshuttle/firewall.py b/sshuttle/firewall.py index f16aac6..001c2a0 100644 --- a/sshuttle/firewall.py +++ b/sshuttle/firewall.py @@ -4,7 +4,6 @@ import sshuttle.ssyslog as ssyslog import sys import os -import platform import traceback from sshuttle.helpers import debug1, debug2, Fatal from sshuttle.methods import get_auto_method, get_method @@ -86,9 +85,6 @@ def main(method_name, syslog): stdin, stdout = setup_daemon() hostmap = {} - debug1('firewall manager: Starting firewall with Python version %s\n' - % platform.python_version()) - if method_name == "auto": method = get_auto_method() else: diff --git a/sshuttle/hostwatch.py b/sshuttle/hostwatch.py index 95a539a..6460281 100644 --- a/sshuttle/hostwatch.py +++ b/sshuttle/hostwatch.py @@ -5,7 +5,6 @@ import errno import os import sys -import platform import subprocess as ssubprocess import sshuttle.helpers as helpers @@ -256,9 +255,6 @@ def hw_main(seed_hosts): else: helpers.logprefix = 'hostwatch: ' - debug1('Starting hostwatch with Python version %s\n' - % platform.python_version()) - read_host_cache() _enqueue(_check_etc_hosts) diff --git a/sshuttle/server.py b/sshuttle/server.py index 4ae2749..8bd329e 100644 --- a/sshuttle/server.py +++ b/sshuttle/server.py @@ -5,7 +5,6 @@ import time import sys import os -import platform import sshuttle.ssnet as ssnet import sshuttle.helpers as helpers @@ -217,8 +216,6 @@ def callback(self, sock): def main(latency_control): - debug1('Starting server with Python version %s\n' - % platform.python_version()) if helpers.verbose >= 1: helpers.logprefix = ' s: '