From owner-svn-src-user@FreeBSD.ORG Tue Oct 23 19:20:51 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42F147E7; Tue, 23 Oct 2012 19:20:51 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0415F8FC1A; Tue, 23 Oct 2012 19:20:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NJKolx038902; Tue, 23 Oct 2012 19:20:50 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NJKo4U038900; Tue, 23 Oct 2012 19:20:50 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201210231920.q9NJKo4U038900@svn.freebsd.org> From: Eitan Adler Date: Tue, 23 Oct 2012 19:20:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r241965 - 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: Tue, 23 Oct 2012 19:20:51 -0000 Author: eadler Date: Tue Oct 23 19:20:50 2012 New Revision: 241965 URL: http://svn.freebsd.org/changeset/base/241965 Log: Make this work with python 3 Modified: user/crees/rclint/rclint.py Modified: user/crees/rclint/rclint.py ============================================================================== --- user/crees/rclint/rclint.py Tue Oct 23 19:17:43 2012 (r241964) +++ user/crees/rclint/rclint.py Tue Oct 23 19:20:50 2012 (r241965) @@ -65,9 +65,9 @@ class Db: if err: logging.error('[%d]: %s ' % (num+1, err)) if verbosity > 0: - print textwrap.fill(self.explanation(key), + print(textwrap.fill(self.explanation(key), initial_indent='==> ', - subsequent_indent=' ') + subsequent_indent=' ')) else: logging.error('No such error: %s' % key) @@ -202,7 +202,7 @@ class Function: return True if self.length <= 1 else False def linenumbers(self): - return range(self.line, self.line+self.length+3) + return list(range(self.line, self.line+self.length+3)) def contains_line(self, line): return True if line in self.linenumbers() else False @@ -220,7 +220,7 @@ def do_rclint(filename): 'Statement': []} for num in range(0, len(lines)): - for obj in lineobj.keys(): + for obj in list(lineobj.keys()): tmp = eval(obj)(lines[num], num) if tmp.value != False: lineobj[obj].append(tmp) @@ -282,7 +282,7 @@ def do_rclint(filename): error.give('file_order', 0) logging.debug('Checking all lines are accounted for') - for obj in lineobj.keys(): + for obj in list(lineobj.keys()): for o in lineobj[obj]: linenumbers.append(o.line) for r in range(0, len(lines)): @@ -358,5 +358,5 @@ error = Db('errors', args.language[0]) # problem = Db('problems', args.language[0]) for f in args.filenames: - print('Checking %s' % f) + print(('Checking %s' % f)) do_rclint(f)