From 56395f7c805466d4742c03716b5a19e574217737 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 Dec 2019 16:51:52 +0000 Subject: [PATCH] make-secnet-sites: OpConf: Move positional_args to OpBase This is actually a general-purpose input/output file handler. Signed-off-by: Ian Jackson --- make-secnet-sites | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make-secnet-sites b/make-secnet-sites index e18c6ce..751479d 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -293,6 +293,11 @@ class PkmElide(PkmBase): class OpBase(): # Base case is reading a sites file from self.inputfilee. # And writing a sites file to self.sitesfile. + def positional_args(self, av): + if len(av.arg)>3: + print("Too many arguments") + sys.exit(1) + (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2] def read_in(self): if self.inputfile is None: self.inputlines = pfile("stdin",sys.stdin.readlines()) @@ -316,11 +321,6 @@ class OpBase(): class OpConf(OpBase): opts = ['--conf'] help = 'sites.conf generation mode (default)' - def positional_args(self, av): - if len(av.arg)>3: - print("Too many arguments") - sys.exit(1) - (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2] def check_group(self,group,w): pass def write_out(self): if self.outputfile is None: -- 2.30.2