[Pkg-debile-commits] [debile-slave] 03/03: pep8 everything
Léo Cavaillé
leo.cavaille-guest at alioth.debian.org
Thu Aug 22 22:21:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
leo.cavaille-guest pushed a commit to branch master
in repository debile-slave.
commit 6f5813b5f5950ee3d565a20538a6b9811d06787a
Author: Léo Cavaillé <leo at cavaille.net>
Date: Thu Aug 22 21:25:18 2013 +0200
pep8 everything
---
debile/slave/commands/adequate.py | 2 ++
debile/slave/commands/build.py | 2 +-
debile/slave/commands/clanganalyzer.py | 2 +-
debile/slave/commands/coccinelle.py | 2 ++
debile/slave/commands/cppcheck.py | 2 ++
debile/slave/commands/desktop_file_validate.py | 4 ++-
debile/slave/commands/lintian.py | 3 ++
debile/slave/commands/lintian4py.py | 1 +
debile/slave/commands/pep8.py | 1 +
debile/slave/commands/perlcritic.py | 1 +
debile/slave/commands/piuparts.py | 1 +
debile/slave/config.py | 3 +-
debile/slave/daemon.py | 44 ++++++++++++++----------
debile/slave/runners/adequate.py | 1 +
debile/slave/runners/clanganalyzer.py | 10 +++---
debile/slave/runners/coccinelle.py | 30 +++++++++-------
debile/slave/runners/cppcheck.py | 1 +
debile/slave/runners/desktop_file_validate.py | 4 ++-
debile/slave/runners/pep8.py | 1 +
debile/slave/runners/perlcritic.py | 3 +-
debile/slave/runners/piuparts.py | 9 ++---
debile/slave/runners/sbuild.py | 10 ++++--
debile/slave/utils.py | 7 ++--
debile/slave/wrappers/clanganalyzer.py | 13 ++++---
debile/slave/wrappers/coccinelle.py | 4 +--
debile/slave/wrappers/lintian.py | 1 +
debile/slave/wrappers/pep8.py | 1 +
debile/slave/wrappers/piuparts.py | 2 +-
setup.py | 6 ++--
29 files changed, 112 insertions(+), 59 deletions(-)
diff --git a/debile/slave/commands/adequate.py b/debile/slave/commands/adequate.py
index 8345baf..1abfab0 100644
--- a/debile/slave/commands/adequate.py
+++ b/debile/slave/commands/adequate.py
@@ -3,6 +3,7 @@ from debile.slave.config import Config
# For binaries only
+
def run(target, package, job, firehose):
if not target.endswith(".deb"):
raise Exception("Non-deb given")
@@ -18,5 +19,6 @@ def run(target, package, job, firehose):
)
return adequate(chroot_name, target, package['name'], firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/build.py b/debile/slave/commands/build.py
index 147390f..caf73a9 100644
--- a/debile/slave/commands/build.py
+++ b/debile/slave/commands/build.py
@@ -4,7 +4,6 @@ import glob
import os
-# target package firehose
def run(dsc, package, job, firehose):
suite = job['suite']
arch = job['arch']
@@ -29,5 +28,6 @@ def run(dsc, package, job, firehose):
return (firehose, out, ftbfs)
+
def get_version():
return version()
diff --git a/debile/slave/commands/clanganalyzer.py b/debile/slave/commands/clanganalyzer.py
index fcd006a..08357f5 100644
--- a/debile/slave/commands/clanganalyzer.py
+++ b/debile/slave/commands/clanganalyzer.py
@@ -2,7 +2,6 @@ from debile.slave.runners.clanganalyzer import clanganalyzer, version
from debile.slave.config import Config
-# target package firehose
def run(dsc, package, job, firehose):
config = Config()
suite = job['suite']
@@ -11,5 +10,6 @@ def run(dsc, package, job, firehose):
return clanganalyzer(dsc, suite, arch, firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/coccinelle.py b/debile/slave/commands/coccinelle.py
index 2f5f5e2..ae62ea2 100644
--- a/debile/slave/commands/coccinelle.py
+++ b/debile/slave/commands/coccinelle.py
@@ -1,7 +1,9 @@
from debile.slave.runners.coccinelle import coccinelle, version
+
def run(dsc, package, job, firehose):
return coccinelle(dsc, firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/cppcheck.py b/debile/slave/commands/cppcheck.py
index 8dae042..fdf617a 100644
--- a/debile/slave/commands/cppcheck.py
+++ b/debile/slave/commands/cppcheck.py
@@ -1,7 +1,9 @@
from debile.slave.runners.cppcheck import cppcheck, version
+
def run(dsc, package, job, firehose):
return cppcheck(dsc, firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/desktop_file_validate.py b/debile/slave/commands/desktop_file_validate.py
index a13fe51..6967e96 100644
--- a/debile/slave/commands/desktop_file_validate.py
+++ b/debile/slave/commands/desktop_file_validate.py
@@ -1,4 +1,5 @@
-from debile.slave.runners.desktop_file_validate import desktop_file_validate, version
+from debile.slave.runners.desktop_file_validate\
+ import desktop_file_validate, version
from debile.slave.utils import run_command, cd
@@ -7,5 +8,6 @@ def run(dsc, source, job, firehose):
with cd('source'):
return desktop_file_validate('source', firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/lintian.py b/debile/slave/commands/lintian.py
index 62dea96..6d674d9 100644
--- a/debile/slave/commands/lintian.py
+++ b/debile/slave/commands/lintian.py
@@ -1,8 +1,11 @@
from debile.slave.runners.lintian import lintian, version
# Can take either a .dsc or a .deb as target
+
+
def run(target, package, job, firehose):
return lintian(target, firehose, lintian_binary='lintian')
+
def get_version():
return version(lintian_binary='lintian')
diff --git a/debile/slave/commands/lintian4py.py b/debile/slave/commands/lintian4py.py
index 276615c..7281df9 100644
--- a/debile/slave/commands/lintian4py.py
+++ b/debile/slave/commands/lintian4py.py
@@ -6,5 +6,6 @@ def run(dfiles, package, job, firehose):
dfiles = [dfiles]
return lintian(dfiles, firehose, lintian_binary='lintian4py')
+
def get_version():
return version(lintian_binary='lintian4py')
diff --git a/debile/slave/commands/pep8.py b/debile/slave/commands/pep8.py
index 36bbc5f..692da27 100644
--- a/debile/slave/commands/pep8.py
+++ b/debile/slave/commands/pep8.py
@@ -4,5 +4,6 @@ from debile.slave.runners.pep8 import pep8, version
def run(dsc, package, job, firehose):
return pep8(dsc, firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/perlcritic.py b/debile/slave/commands/perlcritic.py
index 986ca7a..90b033c 100644
--- a/debile/slave/commands/perlcritic.py
+++ b/debile/slave/commands/perlcritic.py
@@ -4,5 +4,6 @@ from debile.slave.runners.perlcritic import perlcritic, version
def run(dsc, package, job, firehose):
return perlcritic(dsc, firehose)
+
def get_version():
return version()
diff --git a/debile/slave/commands/piuparts.py b/debile/slave/commands/piuparts.py
index 15f298f..3a7188c 100644
--- a/debile/slave/commands/piuparts.py
+++ b/debile/slave/commands/piuparts.py
@@ -18,5 +18,6 @@ def run(target, package, job, firehose):
return piuparts(chroot_name, target, firehose)
+
def get_version():
return version()
diff --git a/debile/slave/config.py b/debile/slave/config.py
index 62ffa19..dfdfbd1 100644
--- a/debile/slave/config.py
+++ b/debile/slave/config.py
@@ -1,8 +1,9 @@
import ConfigParser
-class Config(ConfigParser.ConfigParser):
+class Config(ConfigParser.ConfigParser):
_instance = None
+
def __new__(cls, *args, **kwargs):
if not cls._instance:
cls._instance = super(Config, cls).__new__(cls, *args, **kwargs)
diff --git a/debile/slave/daemon.py b/debile/slave/daemon.py
index b3cabda..ddb3a67 100644
--- a/debile/slave/daemon.py
+++ b/debile/slave/daemon.py
@@ -31,7 +31,8 @@ def workon(suites, arches, capabilities):
if job is None:
yield
else:
- logging.info("Acquired job uuid=%s (%s) for %s/%s", job['uuid'], job['type'], job['suite'], job['arch'])
+ logging.info("Acquired job uuid=%s (%s) for %s/%s",
+ job['uuid'], job['type'], job['suite'], job['arch'])
try:
yield job
except:
@@ -82,15 +83,14 @@ def iterate():
suites = listize(config.get('capabilities', 'suites'))
arches = listize(config.get('capabilities', 'arches'))
- # job is a serialized dictionary from Lucy ORM
- # {'package': {'user_id': 2, 'name': 'cimg', 'created_at': None, 'updated_at': None, 'version': '1.5.6-1', 'source_id': 2, 'type': 'source', 'dsc': 'cimg_1.5.6-1.dsc'}, 'finished_at': None, 'machine': {'last_ping': <DateTime '20130729T09:10:47' at 1906050>, 'password': 'password', 'id': 1, 'gpg_fingerprint': 'D0FEF8101640900183B8C37A42FE51628224AAA3', 'name': 'debian-builder1'}, 'package_id': 2, 'assigned_at': <DateTime '20130729T09:10:48' at 1906098>, 'type': 'perlcritic', 'suite': [...]
+ # job is a serialized dictionary from debian.master ORM
with workon(suites, arches, list(PLUGINS.keys())) as job:
if job is None:
raise IDidNothingError("No more jobs")
package = job['package']
- # Retrieve functions in the module to launch the command and get the version
+ # Retrieve functions in the module to launch the command and version
handler, version_getter = load_module(job['type'])
# Create an empty firehose report with SUT metadata
firehose = create_firehose(package, version_getter)
@@ -99,7 +99,7 @@ def iterate():
with cd(fd):
with checkout(package) as target:
firehose, log, failed = handler(target, package,
- job, firehose)
+ job, firehose)
logging.info("Job worker returned, filing reports")
# report = proxy.submit_report(firehose.to_json(),
@@ -107,23 +107,29 @@ def iterate():
logging.info("Sending the XML firehose report to the pool")
open('firehose.xml', 'w').write(firehose.to_xml_bytes())
- remote_firehose_path = proxy.get_write_location(job['uuid'])
- remote_firehose_path = os.path.join(remote_firehose_path, 'firehose.xml')
- cmd = config.get('lucy', 'copy').format(src='firehose.xml',
- dest=remote_firehose_path)
+ remote_firehose_path = \
+ proxy.get_write_location(job['uuid'])
+ remote_firehose_path = \
+ os.path.join(remote_firehose_path, 'firehose.xml')
+ cmd = config.get('lucy', 'copy')\
+ .format(src='firehose.xml', dest=remote_firehose_path)
out, err, ret = run_command(cmd)
### SCANDALOUS HACK
- ### failed contains potential scan-build repord directory list
+ ### failed contains potential scan-build report directory
if job['type'] == 'clanganalyzer':
if len(failed) == 0:
job['failed'] = False
else:
job['failed'] = True
- logging.info("SCANDALOUS HACK sending scan-build HTML reports")
- remote_scanbuild_path = proxy.get_write_location(job['uuid'])
- remote_scanbuild_path = os.path.join(remote_scanbuild_path, 'scan-build')
- cmd = config.get('lucy', 'copy').format(src=failed[0],
- dest=remote_scanbuild_path)
+ remote_scanbuild_path = \
+ proxy.get_write_location(job['uuid'])
+ remote_scanbuild_path = \
+ os.path.join(
+ remote_scanbuild_path,
+ 'scan-build')
+ cmd = config.get('lucy', 'copy')\
+ .format(src=failed[0],
+ dest=remote_scanbuild_path)
out, err, ret = run_command(cmd)
shutil.rmtree(failed[0])
else:
@@ -133,8 +139,8 @@ def iterate():
remote_log_path = proxy.get_write_location(job['uuid'])
remote_log_path = os.path.join(remote_log_path, 'log.txt')
open('job-log', 'wb').write(log.encode('utf-8'))
- cmd = config.get('lucy', 'copy').format(src='job-log',
- dest=remote_log_path)
+ cmd = config.get('lucy', 'copy')\
+ .format(src='job-log', dest=remote_log_path)
out, err, ret = run_command(cmd)
if ret != 0:
print(out)
@@ -142,7 +148,9 @@ def iterate():
def main():
- logging.basicConfig(format='%(asctime)s - %(levelname)8s - [debile-slave] %(message)s', level=logging.DEBUG)
+ logging.basicConfig(
+ format='%(asctime)s - %(levelname)8s - [debile-slave] %(message)s',
+ level=logging.DEBUG)
logging.info("Booting debile-slave daemon")
while True:
logging.debug("Checking for new jobs")
diff --git a/debile/slave/runners/adequate.py b/debile/slave/runners/adequate.py
index ce760d8..6759c51 100644
--- a/debile/slave/runners/adequate.py
+++ b/debile/slave/runners/adequate.py
@@ -31,6 +31,7 @@ def adequate(chroot_name, target, package_name, analysis):
return analysis, out, failed
+
def version():
#TODO
return ('adequate', 'n/a')
diff --git a/debile/slave/runners/clanganalyzer.py b/debile/slave/runners/clanganalyzer.py
index b381576..6c3a69c 100644
--- a/debile/slave/runners/clanganalyzer.py
+++ b/debile/slave/runners/clanganalyzer.py
@@ -6,6 +6,7 @@ import os
import glob
import shutil
+
def clanganalyzer(package, suite, arch, analysis):
chroot_name = "%s-%s" % (suite, arch)
with schroot(chroot_name) as chroot:
@@ -24,7 +25,9 @@ def clanganalyzer(package, suite, arch, analysis):
# 2/ fake dpkg-buildpackage in the schroot
# Replace the real dpkg-buildpackage by our script
out_, err, ret = chroot.run([
- 'mv', '/usr/bin/dpkg-buildpackage', '/usr/bin/dpkg-buildpackage.faked'
+ 'mv',
+ '/usr/bin/dpkg-buildpackage',
+ '/usr/bin/dpkg-buildpackage.faked'
], user='root')
out += out_
@@ -52,7 +55,6 @@ def clanganalyzer(package, suite, arch, analysis):
], user='root')
out += out_
-
# Now run sbuild in this session chroot for the package
out_, err, ret = run_command([
"sbuild",
@@ -69,8 +71,8 @@ def clanganalyzer(package, suite, arch, analysis):
# Parse the plist reports into Firehose and return
# WARN : if the previous run did not delete the folder, this will fail
- # worst, if we run several instances of virtual builders, this will fail because
- # by default /tmp is a bind mount from the physical server
+ # worst, if we run several instances of virtual builders, this will
+ # fail because by default /tmp is a bind mount from the physical server
reports_dir = glob.glob(internal_report_dir+'*')
### SCANDALOUS HACK !!
diff --git a/debile/slave/runners/coccinelle.py b/debile/slave/runners/coccinelle.py
index a547871..ae03807 100644
--- a/debile/slave/runners/coccinelle.py
+++ b/debile/slave/runners/coccinelle.py
@@ -4,9 +4,12 @@ from debile.slave.config import Config
import os
import glob
+
def list_semantic_patches():
config = Config()
- return glob.iglob(config.get("coccinelle", "coccinelle_patches_folder") + "*/*.cocci")
+ return glob.iglob(
+ config.get("coccinelle", "coccinelle_patches_folder") + "*/*.cocci")
+
def coccinelle(dsc, analysis):
run_command(["dpkg-source", "-x", dsc, "source"])
@@ -16,31 +19,32 @@ def coccinelle(dsc, analysis):
for semantic_patch in list_semantic_patches():
print semantic_patch
out, err, ret = run_command([
- "spatch",
- "-D", "firehose",
- "--cocci-file", semantic_patch,
- "--dir", ".",
- "--no-show-diff",
- "--timeout", "120",
- ])
+ "spatch",
+ "-D", "firehose",
+ "--cocci-file", semantic_patch,
+ "--dir", ".",
+ "--no-show-diff",
+ "--timeout", "120",
+ ])
failed = (ret != 0) or failed
-
+
parsed_results = parse_coccinelle(out)
-
+
for result in parsed_results:
analysis.results.append(result)
-
+
log += "DEAL patch %s\n" % semantic_patch
log += " %d results\n" % len(parsed_results)
-
+
return (analysis, log, failed)
+
def version():
out, err, ret = run_command(["spatch", "--version"])
if ret != 0:
raise Exception("spatch seems not to be installed")
try:
- out = out.split()[2] # we only extract the version number
+ out = out.split()[2] # we only extract the version number
except:
out = out.strip()
return ('coccinelle', out)
diff --git a/debile/slave/runners/cppcheck.py b/debile/slave/runners/cppcheck.py
index f71a606..babf4ce 100644
--- a/debile/slave/runners/cppcheck.py
+++ b/debile/slave/runners/cppcheck.py
@@ -25,6 +25,7 @@ def cppcheck(dsc, analysis):
return (analysis, err, failed)
+
def version():
out, err, ret = run_command([
'cppcheck', '--version'
diff --git a/debile/slave/runners/desktop_file_validate.py b/debile/slave/runners/desktop_file_validate.py
index bd0589f..89c587d 100644
--- a/debile/slave/runners/desktop_file_validate.py
+++ b/debile/slave/runners/desktop_file_validate.py
@@ -1,4 +1,5 @@
-from debile.slave.wrappers.desktop_file_validate import parse_desktop_file_validate
+from debile.slave.wrappers.desktop_file_validate \
+ import parse_desktop_file_validate
from debile.slave.utils import run_command
import os
@@ -16,6 +17,7 @@ def desktop_file_validate(package_root, analysis):
log = log.strip()
return (analysis, log, failed)
+
def version():
#TODO
return ('desktop_file_validate', 'n/a')
diff --git a/debile/slave/runners/pep8.py b/debile/slave/runners/pep8.py
index d47df78..2667b2c 100644
--- a/debile/slave/runners/pep8.py
+++ b/debile/slave/runners/pep8.py
@@ -14,6 +14,7 @@ def pep8(dsc, analysis):
return (analysis, out, failed)
+
def version():
out, err, ret = run_command([
'pep8', '--version'
diff --git a/debile/slave/runners/perlcritic.py b/debile/slave/runners/perlcritic.py
index 6ec2370..f9afb55 100644
--- a/debile/slave/runners/perlcritic.py
+++ b/debile/slave/runners/perlcritic.py
@@ -19,7 +19,8 @@ def perlcritic(dsc, analysis):
return (analysis, out, failed)
+
def version():
- out, err, ret = run_command([ 'perlcritic', '--version' ])
+ out, err, ret = run_command(['perlcritic', '--version'])
#TODO : check ret for perlcritic installation
return ('perlcritic', out.strip())
diff --git a/debile/slave/runners/piuparts.py b/debile/slave/runners/piuparts.py
index bc48980..79056a3 100644
--- a/debile/slave/runners/piuparts.py
+++ b/debile/slave/runners/piuparts.py
@@ -45,10 +45,10 @@ def piuparts(chroot, target, analysis):
print("[ ] Running Piuparts..")
out, err, ret = chroot.run([
'piuparts',
- '-b', copy_location,
- '/tmp/%s' % target,
- '--warn-on-debsums-errors',
- '--pedantic-purge-test',
+ '-b', copy_location,
+ '/tmp/%s' % target,
+ '--warn-on-debsums-errors',
+ '--pedantic-purge-test',
], user='root')
except SchrootCommandError as e:
out, err = e.out, e.err
@@ -59,6 +59,7 @@ def piuparts(chroot, target, analysis):
return analysis, out, failed
+
def version():
#TODO
return ('piuparts', 'n/a')
diff --git a/debile/slave/runners/sbuild.py b/debile/slave/runners/sbuild.py
index 83cb396..7b05c8c 100644
--- a/debile/slave/runners/sbuild.py
+++ b/debile/slave/runners/sbuild.py
@@ -14,6 +14,7 @@ import os
STATS = re.compile("Build needed (?P<time>.*), (?P<space>.*) dis(c|k) space")
VERSION = re.compile("sbuild \(Debian sbuild\) (?P<version>)")
+
def parse_sbuild_log(log, sut, compiler):
gccversion = None
stats = None
@@ -88,13 +89,17 @@ def sbuild(package, suite, arch, compiler, analysis):
], user='root')
out += out_
out_, err, ret = chroot.run([
- 'apt-get', 'install', '-y', '--no-install-recommends', 'cpp', 'g++', 'gcc', 'clang-3.3'
+ 'apt-get', 'install', '-y', '--no-install-recommends',
+ 'cpp', 'g++', 'gcc', 'clang-3.3'
], user='root')
out += out_
versions = ['4.6', '4.7', '4.8']
for v in versions:
out, err, ret = chroot.run([
- 'rm', '-f', '/usr/bin/g++-%s' % v, '/usr/bin/gcc-%s' % v, '/usr/bin/cpp-%s' % v
+ 'rm', '-f',
+ '/usr/bin/g++-%s' % v,
+ '/usr/bin/gcc-%s' % v,
+ '/usr/bin/cpp-%s' % v
], user='root')
out += out_
out_, err, ret = chroot.run([
@@ -128,6 +133,7 @@ def sbuild(package, suite, arch, compiler, analysis):
return analysis, out, ftbfs
+
def version():
out, err, ret = run_command([
"sbuild", '--version'
diff --git a/debile/slave/utils.py b/debile/slave/utils.py
index 92bcb4d..de88b39 100644
--- a/debile/slave/utils.py
+++ b/debile/slave/utils.py
@@ -12,7 +12,6 @@ import sys
import os
-
def upgrade(chroot):
print("Schrooting")
with schroot(chroot) as chroot:
@@ -127,7 +126,11 @@ def upload(changes, job_id):
prepare_binary_for_upload(changes, job_id)
- out, err, ret = run_command(['dput', config.get('lucy', 'dput-host'), changes])
+ out, err, ret = run_command([
+ 'dput',
+ config.get('lucy', 'dput-host'),
+ changes
+ ])
if ret != 0:
print(out)
print(err)
diff --git a/debile/slave/wrappers/clanganalyzer.py b/debile/slave/wrappers/clanganalyzer.py
index ada673d..c199af2 100644
--- a/debile/slave/wrappers/clanganalyzer.py
+++ b/debile/slave/wrappers/clanganalyzer.py
@@ -32,8 +32,9 @@ from pprint import pprint
import sys
from firehose.model import Message, Function, Point, Range, \
- File, Location, Generator, Metadata, Analysis, Issue, Sut, Trace, \
- State, Notes
+ File, Location, Generator, Metadata, Analysis, Issue, Sut, Trace, \
+ State, Notes
+
def parse_scandir(resultdir):
"""
@@ -43,6 +44,7 @@ def parse_scandir(resultdir):
for filename in glob.glob(os.path.join(resultdir, 'report-*.plist')):
yield parse_plist(filename)
+
def parse_plist(pathOrFile):
"""
Given a .plist file emitted by clang-static-analyzer (e.g. via
@@ -87,17 +89,19 @@ def parse_plist(pathOrFile):
trace = make_trace(files, diagnostic['path'])
issue = Issue(cwe,
- None, # FIXME: can we get at the test id?
+ None, # FIXME: can we get at the test id?
location, message, notes, trace)
yield issue
+
def make_point_from_plist_point(loc):
# point:
# e.g. {'col': 2, 'file': 0, 'line': 130}
return Point(int(loc.line),
int(loc.col))
+
def make_location_from_point(files, loc):
# loc:
# e.g. {'col': 2, 'file': 0, 'line': 130}
@@ -111,6 +115,7 @@ def make_location_from_point(files, loc):
point=make_point_from_plist_point(loc))
return location
+
def make_location_from_range(files, range_):
# range_:
# e.g.:
@@ -141,6 +146,7 @@ def make_location_from_range(files, range_):
return location
+
def make_trace(files, path):
"""
Construct a Trace instance from the .plist's 'path' list
@@ -196,4 +202,3 @@ def make_trace(files, path):
else:
raise ValueError('unknown kind: %r' % kind)
return trace
-
diff --git a/debile/slave/wrappers/coccinelle.py b/debile/slave/wrappers/coccinelle.py
index bcb19f2..0e1b40d 100644
--- a/debile/slave/wrappers/coccinelle.py
+++ b/debile/slave/wrappers/coccinelle.py
@@ -1,11 +1,11 @@
import StringIO
from firehose.model import Analysis
+
def parse_coccinelle(lines):
# we have to emulate a file for from_xml()
firehose = StringIO.StringIO(lines)
analysis = Analysis.from_xml(firehose)
-
+
for result in analysis.results:
yield result
-
diff --git a/debile/slave/wrappers/lintian.py b/debile/slave/wrappers/lintian.py
index 7a174ee..5504d3e 100644
--- a/debile/slave/wrappers/lintian.py
+++ b/debile/slave/wrappers/lintian.py
@@ -6,6 +6,7 @@ LINE_RE = re.compile(
r"(?P<severity>\w): (?P<package>.*): (?P<testid>[^\s]+)( (?P<message>.*))?"
)
+
def parse_lintian(lines, fpath):
severities = {
"w": "warning",
diff --git a/debile/slave/wrappers/pep8.py b/debile/slave/wrappers/pep8.py
index fd2a954..369a862 100644
--- a/debile/slave/wrappers/pep8.py
+++ b/debile/slave/wrappers/pep8.py
@@ -6,6 +6,7 @@ LINE_RE = re.compile(
r"(?P<path>.*):(?P<line>\d+):(?P<col>\d+): (?P<err>[^ ]+) (?P<msg>.*)"
)
+
def parse_pep8(lines):
for line in lines:
info = LINE_RE.match(line).groupdict()
diff --git a/debile/slave/wrappers/piuparts.py b/debile/slave/wrappers/piuparts.py
index 5eb2d46..e118473 100644
--- a/debile/slave/wrappers/piuparts.py
+++ b/debile/slave/wrappers/piuparts.py
@@ -14,7 +14,7 @@ def parse_piuparts(lines, path):
cur_msg = ""
cat = {
- "dependency-is-messed-up": ["you have held broken packages",],
+ "dependency-is-messed-up": ["you have held broken packages", ],
"conffile-stuff-sucks": ["owned by: .+"],
"command-not-found": ["command not found|: not found"],
"conffile-modified": [
diff --git a/setup.py b/setup.py
index a779f5d..2201a4f 100755
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,10 @@ setup(
license="Expat",
url="http://deb.io/",
platforms=['any'],
- entry_points = {
+ entry_points={
'console_scripts': [
- 'debile-slaved = debile.slave.daemon:main',
- 'debile-update = debile.slave.utils:doupdate',
+ 'debile-slaved = debile.slave.daemon:main',
+ 'debile-update = debile.slave.utils:doupdate',
],
}
)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-slave.git
More information about the Pkg-debile-commits
mailing list