From 5d0fb05dc044291870bd7e44601bb78f0b7f830c Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 3 Oct 2015 12:53:25 +0200 Subject: [PATCH] pkgs.py got a little cleanup; hopefully python3 ready --- pkgs.py | 163 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 87 insertions(+), 76 deletions(-) diff --git a/pkgs.py b/pkgs.py index 0ba73cf7..3aafc3d4 100755 --- a/pkgs.py +++ b/pkgs.py @@ -26,6 +26,8 @@ # -package=centos5: p1 p2 # -package<=centos5: p1 p2 +from __future__ import print_function + import sys from sys import stderr from optparse import OptionParser @@ -58,33 +60,33 @@ known_keywords = [ m_fcdistro_cutter = re.compile('([a-z]+)([0-9]+)') -re_ident='[a-z]+' +re_ident = '[a-z]+' class PkgsParser: - def __init__ (self,arch,fcdistro,pldistro,keyword,inputs,options): - self.arch=arch - self.fcdistro=fcdistro - self.pldistro=pldistro - self.keyword=keyword - self.inputs=inputs + def __init__(self, arch, fcdistro, pldistro, keyword, inputs, options): + self.arch = arch + self.fcdistro = fcdistro + self.pldistro = pldistro + self.keyword = keyword + self.inputs = inputs # for verbose, new_line, and the like - self.options=options - ok=False + self.options = options + ok = False for known in known_fcdistros: if fcdistro == known: try: - (distro,version)=m_fcdistro_cutter.match(fcdistro).groups() + (distro, version) = m_fcdistro_cutter.match(fcdistro).groups() # debian-like names can't use numbering except: - distro=fcdistro - version=0 - ok=True + distro = fcdistro + version = 0 + ok = True if ok: - self.distro=distro - self.version=int(version) + self.distro = distro + self.version = int(version) else: - print >> stderr, 'unrecognized fcdistro', fcdistro + print('unrecognized fcdistro', fcdistro, file=stderr) sys.exit(1) # qualifier is either '>=','<=', or '=' @@ -96,144 +98,153 @@ class PkgsParser: elif qualifier == '<=': return self.version <= version else: - raise Exception, 'Internal error - unexpected qualifier %r' % qualifier + raise Exception('Internal error - unexpected qualifier {qualifier}'.format(**locals())) - m_comment=re.compile('\A\s*#') - m_blank=re.compile('\A\s*\Z') + m_comment = re.compile('\A\s*#') + m_blank = re.compile('\A\s*\Z') - m_ident=re.compile('\A'+re_ident+'\Z') + m_ident = re.compile('\A'+re_ident+'\Z') re_qualified = '\s*' re_qualified += '(?P[+-]?)' re_qualified += '\s*' - re_qualified += '(?P%s)'%re_ident + re_qualified += '(?P{re_ident})'.format(re_ident=re_ident) re_qualified += '\s*' re_qualified += '(?P>=|<=|=)' re_qualified += '\s*' - re_qualified += '(?P%s[0-9]+)'%re_ident + re_qualified += '(?P{re_ident}[0-9]+)'.format(re_ident=re_ident) re_qualified += '\s*' - m_qualified = re.compile('\A%s\Z'%re_qualified) + m_qualified = re.compile('\A{re_qualified}\Z'.format(**locals())) re_old = '[a-z]+[+-][a-z]+[0-9]+' - m_old = re.compile ('\A%s\Z'%re_old) + m_old = re.compile('\A{re_old}\Z'.format(**locals())) - # returns a tuple (included,excluded) - def parse (self,filename): - ok=True - included=[] - excluded=[] - lineno=0 + # returns a tuple (included, excluded) + def parse(self, filename): + ok = True + included = [] + excluded = [] + lineno = 0 try: for line in file(filename).readlines(): lineno += 1 - line=line.strip() + line = line.strip() if self.m_comment.match(line) or self.m_blank.match(line): continue try: - [lefts,rights] = line.split(':',1) + lefts, rights = line.split(':', 1) for left in lefts.split(): ########## single ident if self.m_ident.match(left): if left not in known_keywords: - raise Exception,"Unknown keyword %r"%left + raise Exception("Unknown keyword {left}".format(**locals())) elif left == self.keyword: included += rights.split() else: - m=self.m_qualified.match(left) + m = self.m_qualified.match(left) if m: - (plus_minus,kw,qual,fcdistro) = m.groups() + (plus_minus, kw, qual, fcdistro) = m.groups() if kw not in known_keywords: - raise Exception,"Unknown keyword in %r"%left + raise Exception("Unknown keyword in {left}".format(**locals())) if fcdistro not in known_fcdistros: - raise Exception, 'Unknown fcdistro %r'%fcdistro + raise Exception('Unknown fcdistro {fcdistro}'.format(**locals())) # skip if another keyword if kw != self.keyword: continue # does this fcdistro match ? - (distro,version)=m_fcdistro_cutter.match(fcdistro).groups() + (distro, version) = m_fcdistro_cutter.match(fcdistro).groups() version = int (version) # skip if another distro family if distro != self.distro: continue # skip if the qualifier does not fit if not self.match (qual, version): - if self.options.verbose: print >> stderr,'%s:%d:qualifer %s does not apply'%(filename,lineno,left) + if self.options.verbose: + print('{filename}:{lineno}:qualifer {left} does not apply' + .format(**locals()), file=stderr) continue # we're in, let's add (default) or remove (if plus_minus is minus) if plus_minus == '-': - if self.options.verbose: print >> stderr,'%s:%d: from %s, excluding %r'%(filename,lineno,left,rights) + if self.options.verbose: + print('{filename}:{lineno}: from {left}, excluding {rights}' + .format(**locals()), file=stderr) excluded += rights.split() else: - if self.options.verbose: print >> stderr,'%s:%d: from %s, including %r'%(filename,lineno,left,rights) + if self.options.verbose: + print('{filename}:{lineno}: from {left}, including {rights}'\ + .format(**locals()), file=stderr) included += rights.split() elif self.m_old.match(left): - raise Exception,'Old-fashioned syntax not supported anymore %r'%left + raise Exception('Old-fashioned syntax not supported anymore {left}'.\ + format(**locals())) else: - raise Exception,'error in left expression %r'%left + raise Exception('error in left expression {left}'.format(**locals())) - except Exception,e: - ok=False - print >> stderr, "%s:%d:syntax error: %r"%(filename,lineno,e) - except Exception,e: - ok=False - print >> stderr, 'Could not parse file',filename,e - return (ok,included,excluded) + except Exception as e: + ok = False + print("{filename}:{lineno}:syntax error: {e}".format(**locals()), file=stderr) + except Exception as e: + ok = False + print('Could not parse file', filename, e, file=stderr) + return (ok, included, excluded) def run (self): - ok=True - included=[] - excluded=[] + ok = True + included = [] + excluded = [] for input in self.inputs: - (o,i,e) = self.parse (input) + (o, i, e) = self.parse (input) included += i excluded += e ok = ok and o # avoid set operations that would not preserve order results = [ x for x in included if x not in excluded ] - results = [ x.replace('@arch@',self.arch).\ - replace('@fcdistro@',self.fcdistro).\ - replace('@pldistro@',self.pldistro) for x in results] + results = [ x.replace('@arch@', self.arch).\ + replace('@fcdistro@', self.fcdistro).\ + replace('@pldistro@', self.pldistro) for x in results] if self.options.sort_results: results.sort() # default is space-separated if not self.options.new_line: - print " ".join(results) + print(" ".join(results)) # but for tests results are printed each on a line else: - for result in results : print result + for result in results: + print(result) return ok def main (): - usage="Usage: %prog [options] keyword input[...]" - parser=OptionParser (usage=usage) - parser.add_option ('-a','--arch',dest='arch',action='store',default=default_arch, - help='target arch, e.g. i386 or x86_64, default=%s'%default_arch) - parser.add_option ('-f','--fcdistro',dest='fcdistro',action='store', default=default_fcdistro, + usage = "Usage: %prog [options] keyword input[...]" + parser = OptionParser (usage=usage) + parser.add_option ('-a', '--arch', dest='arch', action='store', default=default_arch, + help='target arch, e.g. i386 or x86_64, default={}'.format(default_arch)) + parser.add_option ('-f', '--fcdistro', dest='fcdistro', action='store', default=default_fcdistro, help='fcdistro, e.g. f12 or centos5') - parser.add_option ('-d','--pldistro',dest='pldistro',action='store', default=default_pldistro, + parser.add_option ('-d', '--pldistro', dest='pldistro', action='store', default=default_pldistro, help='pldistro, e.g. onelab or planetlab') - parser.add_option ('-v', '--verbose',dest='verbose',action='store_true',default=False, + parser.add_option ('-v', '--verbose', dest='verbose', action='store_true', default=False, help='verbose when using qualifiers') - parser.add_option ('-n', '--new-line',dest='new_line',action='store_true',default=False, + parser.add_option ('-n', '--new-line', dest='new_line', action='store_true', default=False, help='print outputs separated with newlines rather than with a space') - parser.add_option ('-u', '--no-sort',dest='sort_results',default=True,action='store_false', + parser.add_option ('-u', '--no-sort', dest='sort_results', default=True, action='store_false', help='keep results in the same order as in the inputs') - (options,args) = parser.parse_args() + (options, args) = parser.parse_args() - if len(args) <=1 : + if len(args) <= 1 : parser.print_help(file=stderr) sys.exit(1) - keyword=args[0] - inputs=args[1:] + keyword = args[0] + inputs = args[1:] if not options.arch in known_arch: - print >> stderr, 'Unsupported arch',options.arch + print('Unsupported arch', options.arch, file=stderr) parser.print_help(file=stderr) sys.exit(1) - if options.arch == 'i686': options.arch='i386' + if options.arch == 'i686': + options.arch='i386' if not options.fcdistro in known_fcdistros: - print >> stderr, 'Unsupported fcdistro',options.fcdistro + print('Unsupported fcdistro', options.fcdistro, file=stderr) parser.print_help(file=stderr) sys.exit(1) - pkgs = PkgsParser (options.arch,options.fcdistro,options.pldistro,keyword,inputs,options) + pkgs = PkgsParser(options.arch, options.fcdistro, options.pldistro, keyword, inputs, options) if pkgs.run(): sys.exit(0) -- 2.43.0