From 7472c8aa78f5a3d286c7e30950a537df2fa18a31 Mon Sep 17 00:00:00 2001 From: Delio Brignoli Date: Sat, 17 Oct 2015 02:50:51 +0200 Subject: [PATCH] argparse: PEP8 formatting --- argparse/argparse.py | 8 ++++++-- argparse/test_argparse.py | 14 +++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/argparse/argparse.py b/argparse/argparse.py index d8c2ef95..2e06857a 100644 --- a/argparse/argparse.py +++ b/argparse/argparse.py @@ -5,9 +5,11 @@ Minimal and functional version of CPython's argparse module. import sys from _collections import namedtuple + class _ArgError(BaseException): pass + class _Arg: def __init__(self, names, dest, action, nargs, const, default, help): self.names = names @@ -21,7 +23,7 @@ class _Arg: def parse(self, optname, args): # parse args for this arg if self.action == "store": - if self.nargs == None: + if self.nargs is None: if args: return args.pop(0) else: @@ -60,6 +62,7 @@ class _Arg: else: assert False + def _dest_from_optnames(opt_names): dest = opt_names[0] for name in opt_names: @@ -102,11 +105,12 @@ class ArgumentParser: args = [dest] list.append( _Arg(args, dest, action, kwargs.get("nargs", None), - const, default, kwargs.get("help", ""))) + const, default, kwargs.get("help", ""))) def usage(self, full): # print short usage print("usage: %s [-h]" % sys.argv[0], end="") + def render_arg(arg): if arg.action == "store": if arg.nargs is None: diff --git a/argparse/test_argparse.py b/argparse/test_argparse.py index ad3d8060..7c5651c9 100644 --- a/argparse/test_argparse.py +++ b/argparse/test_argparse.py @@ -11,24 +11,24 @@ parser = argparse.ArgumentParser() parser.add_argument("-a", action="store_true") parser.add_argument("-b", default=123) args = parser.parse_args([]) -assert args.a == False and args.b == 123 +assert args.a is False and args.b == 123 args = parser.parse_args(["-a"]) -assert args.a == True and args.b == 123 +assert args.a is True and args.b == 123 args = parser.parse_args(["-b", "456"]) -assert args.a == False and args.b == "456" +assert args.a is False and args.b == "456" parser = argparse.ArgumentParser() parser.add_argument("-a", "--a-opt", action="store_true") parser.add_argument("-b", "--b-opt", default=123) parser.add_argument("--c-opt", default="test") args = parser.parse_args([]) -assert args.a_opt == False and args.b_opt == 123 and args.c_opt == "test" +assert args.a_opt is False and args.b_opt == 123 and args.c_opt == "test" args = parser.parse_args(["--a-opt"]) -assert args.a_opt == True and args.b_opt == 123 and args.c_opt == "test" +assert args.a_opt is True and args.b_opt == 123 and args.c_opt == "test" args = parser.parse_args(["--b-opt", "456"]) -assert args.a_opt == False and args.b_opt == "456" and args.c_opt == "test" +assert args.a_opt is False and args.b_opt == "456" and args.c_opt == "test" args = parser.parse_args(["--c-opt", "override"]) -assert args.a_opt == False and args.b_opt == 123 and args.c_opt == "override" +assert args.a_opt is False and args.b_opt == 123 and args.c_opt == "override" parser = argparse.ArgumentParser() parser.add_argument("files", nargs="+")