X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=t%2Fmoe%2Fpipeline.py;h=e8138200461b943dd0c7b5007f6b51180321d18f;hb=878693c0f1a0a4cee1ae0478e762b4c57dc44df3;hp=bffca80ffc408e4a900a9c1835b3fe504bdfc3d9;hpb=a249fb797c925052e3ad692d887eb2004d66c455;p=moe.git diff --git a/t/moe/pipeline.py b/t/moe/pipeline.py index bffca80..e813820 100644 --- a/t/moe/pipeline.py +++ b/t/moe/pipeline.py @@ -38,9 +38,10 @@ class Pipeline: Debugging dump of the pipe. Returns a list of lines. """ - l=["%s >>> Pipeline %s\n" % (prefix, self.name)] + l=["%s >>> Pipeline %s" % (prefix, self.name)] for pri, name, fun in self.pipe: - l.append("%s% 3d %s, %s\n" % (prefix, pri, name, fun)) + l.append("%s% 3d %s, %s" % (prefix, pri, name, fun)) + return l def run(self, *args, **kwargs): self.index = 0 @@ -48,14 +49,14 @@ class Pipeline: while self.index < len(self.pipe): (pri,name,fun) = self.pipe[self.index] if pri >= min_pri: - self.e.log.debug("Pipeline %r:%d running: %s\n" % (self.name, pri, name)) + self.e.log.debug("Pipeline %r:%d running: %s" % (self.name, pri, name)) try: fun(*args, **kwargs) except MoeAbortPipeline, err: min_pri = self.skip_to else: - self.e.log.debug("Pipeline %r:d skipping: %s\n" % (self.name, pri, name)) + self.e.log.debug("Pipeline %r:d skipping: %s" % (self.name, pri, name)) self.index += 1 self.index = -1 - self.e.log.debug("Pipeline %r finished\n" % (self.name)) + self.e.log.debug("Pipeline %r finished" % (self.name))