Mercurial > bitten > bitten-test
changeset 219:aef09843d367
Some pylint-inspired cleanup.
| author | cmlenz |
|---|---|
| date | Wed, 21 Sep 2005 23:06:12 +0000 |
| parents | b329b4d4d184 |
| children | 3ab0004a6fd9 |
| files | bitten/build/pythontools.py bitten/trac_ext/charts.py bitten/trac_ext/summarizers.py bitten/trac_ext/web_ui.py bitten/upgrades.py bitten/util/beep.py bitten/util/loc.py |
| diffstat | 7 files changed, 15 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/build/pythontools.py +++ b/bitten/build/pythontools.py @@ -143,7 +143,7 @@ coverage_file = open(coverage_path, 'r') lines = [] try: - for num, coverage_line in enumerate(coverage_file): + for coverage_line in coverage_file: match = coverage_line_re.search(coverage_line) if match: hits = match.group(1) @@ -214,7 +214,9 @@ continue test.attr[name] = value for grandchild in child.children(): - test.append(xmlio.Element(grandchild.name)[grandchild.gettext()]) + test.append(xmlio.Element(grandchild.name)[ + grandchild.gettext() + ]) results.append(test) ctxt.report('test', results) finally:
--- a/bitten/trac_ext/charts.py +++ b/bitten/trac_ext/charts.py @@ -7,14 +7,12 @@ # you should have received as part of this distribution. The terms # are also available at http://bitten.cmlenz.net/wiki/License. -from datetime import datetime import re from trac.core import * from trac.web import IRequestHandler -from bitten.model import BuildConfig, Build, Report +from bitten.model import BuildConfig from bitten.trac_ext.api import IReportChartGenerator -from bitten.util import xmlio class ReportChartController(Component):
--- a/bitten/trac_ext/summarizers.py +++ b/bitten/trac_ext/summarizers.py @@ -8,10 +8,8 @@ # are also available at http://bitten.cmlenz.net/wiki/License. from trac.core import * -from trac.util import escape from trac.web.chrome import Chrome from trac.web.clearsilver import HDFWrapper -from bitten.model import BuildConfig from bitten.trac_ext.api import IReportSummarizer
--- a/bitten/trac_ext/web_ui.py +++ b/bitten/trac_ext/web_ui.py @@ -392,7 +392,7 @@ next_href = self.env.href.build(config.name, page=page + 1) add_link(req, 'next', next_href, 'Next Page') - except TracError, e: + except TracError: self.log.error('Error accessing repository info', exc_info=True) def _render_config_confirm(self, req, config_name): @@ -523,7 +523,7 @@ add_stylesheet(req, 'bitten/bitten.css') db = self.env.get_db_cnx() cursor = db.cursor() - cursor.execute("SELECT b.id,b.config,c.label,b.rev,p.name,b.slave," + cursor.execute("SELECT b.id,b.config,c.label,b.rev,p.name," "b.stopped,b.status FROM bitten_build AS b" " INNER JOIN bitten_config AS c ON (c.name=b.config)" " INNER JOIN bitten_platform AS p ON (p.id=b.platform) " @@ -532,7 +532,7 @@ (start, stop, Build.SUCCESS, Build.FAILURE)) event_kinds = {Build.SUCCESS: 'successbuild', Build.FAILURE: 'failedbuild'} - for id, config, label, rev, platform, slave, stopped, status in cursor: + for id, config, label, rev, platform, stopped, status in cursor: title = 'Build of <em>%s [%s]</em> on %s %s' \ % (escape(label), escape(rev), escape(platform), _status_label[status])
--- a/bitten/upgrades.py +++ b/bitten/upgrades.py @@ -60,7 +60,7 @@ try: from bsddb3 import db as bdb import dbxml - except ImportError, e: + except ImportError: return dbfile = os.path.join(env.path, 'db', 'bitten.dbxml') @@ -132,7 +132,7 @@ try: from bsddb3 import db as bdb import dbxml - except ImportError, e: + except ImportError: return dbfile = os.path.join(env.path, 'db', 'bitten.dbxml') @@ -225,7 +225,6 @@ def fixup_generators(env, db): """Upgrade the identifiers for the recipe commands that generated log messages and report data.""" - from bitten.model import BuildLog, Report mapping = { 'pipe': 'http://bitten.cmlenz.net/tools/sh#pipe', @@ -237,9 +236,9 @@ cursor.execute("SELECT id,generator FROM bitten_log " "WHERE generator IN (%s)" % ','.join([repr(key) for key in mapping.keys()])) - for id, generator in cursor: + for log_id, generator in cursor: cursor.execute("UPDATE bitten_log SET generator=%s " - "WHERE id=%s", (mapping[generator], id)) + "WHERE id=%s", (mapping[generator], log_id)) mapping = { 'unittest': 'http://bitten.cmlenz.net/tools/python#unittest', @@ -249,9 +248,9 @@ cursor.execute("SELECT id,generator FROM bitten_report " "WHERE generator IN (%s)" % ','.join([repr(key) for key in mapping.keys()])) - for id, generator in cursor: + for report_id, generator in cursor: cursor.execute("UPDATE bitten_report SET generator=%s " - "WHERE id=%s", (mapping[generator], id)) + "WHERE id=%s", (mapping[generator], report_id)) map = { 2: [add_log_table],
--- a/bitten/util/beep.py +++ b/bitten/util/beep.py @@ -33,7 +33,6 @@ except ImportError: from StringIO import StringIO import sys -import time from bitten.util import xmlio @@ -379,7 +378,7 @@ """ try: asyncore.loop() - except TerminateSession, e: + except TerminateSession: log.info('Terminating session') self.terminate()