diff options
| author | Brian May <brian@linuxpenguins.xyz> | 2016-03-22 13:19:32 +1100 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2016-03-22 13:19:32 +1100 |
| commit | b8160c4a378c0ad866093da56dc412c588fb3dac (patch) | |
| tree | f5ec2bd0766cf08302c37dfc46a83d45536d81bb | |
| parent | 05bacf6fd66bf89ad9a9b9f3e0b09e75bc73d706 (diff) | |
Fix pep8 issues
| -rw-r--r-- | sshuttle/cmdline.py | 5 | ||||
| -rw-r--r-- | sshuttle/options.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sshuttle/cmdline.py b/sshuttle/cmdline.py index 279e507..65e59bf 100644 --- a/sshuttle/cmdline.py +++ b/sshuttle/cmdline.py @@ -1,14 +1,13 @@ -import sys import re -import socket import sshuttle.helpers as helpers import sshuttle.client as client import sshuttle.firewall as firewall import sshuttle.hostwatch as hostwatch import sshuttle.ssyslog as ssyslog -from sshuttle.options import parser +from sshuttle.options import parser, parse_ipport6, parse_ipport4 from sshuttle.helpers import family_ip_tuple, log, Fatal + def main(): opt = parser.parse_args() diff --git a/sshuttle/options.py b/sshuttle/options.py index 2ddb0a2..1278b36 100644 --- a/sshuttle/options.py +++ b/sshuttle/options.py @@ -2,7 +2,7 @@ import re import socket from argparse import ArgumentParser, Action, ArgumentTypeError as Fatal from sshuttle import __version__ -from sshuttle.helpers import family_ip_tuple + # 1.2.3.4/5 or just 1.2.3.4 def parse_subnet4(s): @@ -124,7 +124,7 @@ parser.add_argument( """ ) parser.add_argument( - "-l", "--listen", + "-l", "--listen", metavar="[IP:]PORT", help=""" transproxy to this ip address and port number |