From owner-svn-src-user@FreeBSD.ORG Mon Feb 18 01:14:22 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DBCF5FB5; Mon, 18 Feb 2013 01:14:22 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BE0D6220; Mon, 18 Feb 2013 01:14:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1I1EMTB053102; Mon, 18 Feb 2013 01:14:22 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1I1EMVT053101; Mon, 18 Feb 2013 01:14:22 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201302180114.r1I1EMVT053101@svn.freebsd.org> From: Eitan Adler Date: Mon, 18 Feb 2013 01:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r246928 - user/crees/rclint X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 01:14:22 -0000 Author: eadler Date: Mon Feb 18 01:14:21 2013 New Revision: 246928 URL: http://svnweb.freebsd.org/changeset/base/246928 Log: pep8 style fixes Modified: user/crees/rclint/rclint.py Modified: user/crees/rclint/rclint.py ============================================================================== --- user/crees/rclint/rclint.py Mon Feb 18 01:08:59 2013 (r246927) +++ user/crees/rclint/rclint.py Mon Feb 18 01:14:21 2013 (r246928) @@ -37,6 +37,7 @@ import logging import re import textwrap + class Db: def __init__(self, dbname, language): self._contents = [] @@ -76,7 +77,7 @@ class Db: else: logging.error('No such error: %s' % key) self.count += 1 - if self.count > 10 and beaucoup_errors == False: + if self.count > 10 and not beaucoup_errors: hint = ' Try rerunning with -v option for extra details.' if verbosity == 0 else '' logging.error('Error threshold reached-- further errors are unlikely to be helpful. Fix the errors and rerun. The -k option will cause rclint to continue for as many errors as it finds.' + hint) exit() @@ -84,6 +85,7 @@ class Db: def warn(self, key, num=-1, level='warn'): self.give(key, num, level) + class Statement: def __init__(self, lines, number): types = {'.': 'source', 'load_rc_config': 'load_rc_config', @@ -121,6 +123,7 @@ class Statement: else: return self.value + class Variable(Statement): def __init__(self, lines, number): line = lines[number] @@ -156,7 +159,7 @@ class Variable(Statement): (self.name, assignment, self.value) = is_shorthand self.clobber = True if assignment[0] == ':' else False self.type = 'shorthand' - + if not hasattr(self, 'value'): self.value = False self.line = number @@ -172,6 +175,7 @@ class Variable(Statement): def is_empty(self): return False if re.match('[\'"]?[^\'"]+[\'"]?', self.value) else True + class Comment: def __init__(self, lines, number): line = lines[number] @@ -185,6 +189,7 @@ class Comment: else: return False + class Shebang: def __init__(self, comment): self.line = comment.line @@ -195,6 +200,7 @@ class Shebang: else: self.value = False + class Rcorder: def __init__(self, comment): self.line = comment.line @@ -204,6 +210,7 @@ class Rcorder: else: self.value = False + class RcsId: def __init__(self, comment): self.line = comment.line @@ -213,6 +220,7 @@ class RcsId: else: self.value = False + class Function: def __init__(self, lines, num): if len(lines[0]) > 1 and lines[0][-1] == '{': @@ -248,6 +256,7 @@ class Function: def contains_line(self, line): return True if line in self.linenumbers() else False + def get(objlist, name): for o in objlist: if o.name == name: @@ -255,6 +264,7 @@ def get(objlist, name): else: return False + def do_ports_checking(lineobj, filename): logging.debug('Now on ports-specific section') logging.debug('Checking for defaults clobbering blank values') @@ -268,9 +278,11 @@ def do_ports_checking(lineobj, filename) error.give('variables_defaults_old_style', var.line) return + def do_src_checking(lineobj, filename): return + def do_rclint(filename): logging.debug('Suck in file %s' % filename) try: @@ -286,7 +298,7 @@ def do_rclint(filename): for num in range(0, len(lines)): for obj in list(lineobj.keys()): tmp = eval(obj)(lines, num) - if tmp.value != False: + if not tmp.value: lineobj[obj].append(tmp) break @@ -410,7 +422,7 @@ def do_rclint(filename): error.give('rcvar_incorrect', var.line) except: error.give('file_order', var.line) - + logging.debug('Checking for function issues') for function in lineobj['Function']: if function.short(): @@ -450,7 +462,7 @@ parser = argparse.ArgumentParser() parser.add_argument('filenames', nargs='+') parser.add_argument('--language', nargs=1, type=str, default=['en'], help='sets the language that errors are reported in') parser.add_argument('-v', action='count', help='raises debug level; provides detailed explanations of errors') -parser.add_argument('--version', action='version', version='%s.%s.%s-%s'%(MAJOR, MINOR, MICRO, __version__)) +parser.add_argument('--version', action='version', version='%s.%s.%s-%s' %(MAJOR, MINOR, MICRO, __version__)) parser.add_argument('-b', action='store_true', help='chooses base RC script mode') parser.add_argument('-p', action='store_true', help='chooses ports RC script mode (default)') parser.add_argument('-k', action='store_true', help='tells rclint to carry on reporting even if there are over 10 errors') @@ -459,7 +471,7 @@ args = parser.parse_args() mode = 'base' if args.b else 'ports' beaucoup_errors = args.k -verbosity = args.v if args.v != None else 0 +verbosity = args.v if args.v is not None else 0 logging.basicConfig(level=logging.DEBUG if verbosity > 1 else logging.WARN) error = Db('errors', args.language[0])