diff --git a/nodepool/cmd/nodepoolcmd.py b/nodepool/cmd/nodepoolcmd.py index 2b06694d2..17b96a30e 100644 --- a/nodepool/cmd/nodepoolcmd.py +++ b/nodepool/cmd/nodepoolcmd.py @@ -145,13 +145,13 @@ class NodePoolCmd(NodepoolApp): l.setLevel(logging.WARNING) def list(self, node_id=None): - print status.node_list(self.zk, node_id) + print(status.node_list(self.zk, node_id)) def dib_image_list(self): - print status.dib_image_list(self.zk) + print(status.dib_image_list(self.zk)) def image_list(self): - print status.image_list(self.zk) + print(status.image_list(self.zk)) def image_build(self, diskimage=None): diskimage = diskimage or self.args.image @@ -189,7 +189,7 @@ class NodePoolCmd(NodepoolApp): except Exception as e: log.warning("Exception listing aliens for %s: %s" % (provider.name, str(e.message))) - print t + print(t) def alien_image_list(self): self.pool.updateConfig() @@ -237,7 +237,7 @@ class NodePoolCmd(NodepoolApp): if image['id'] in alien_ids: t.add_row([provider.name, image['name'], image['id']]) - print t + print(t) def hold(self): node = self.zk.getNode(self.args.id) @@ -315,7 +315,7 @@ class NodePoolCmd(NodepoolApp): #TODO(asselin,yolanda): add validation of secure.conf def request_list(self): - print status.request_list(self.zk) + print(status.request_list(self.zk)) def _wait_for_threads(self, threads): for t in threads: diff --git a/nodepool/fakeprovider.py b/nodepool/fakeprovider.py index 67a12f76f..debdf974e 100644 --- a/nodepool/fakeprovider.py +++ b/nodepool/fakeprovider.py @@ -262,6 +262,6 @@ class FakeFile(StringIO.StringIO): self.__path = path def close(self): - print "Wrote to %s:" % self.__path - print self.getvalue() + print("Wrote to %s:" % self.__path) + print(self.getvalue()) StringIO.StringIO.close(self) diff --git a/tox.ini b/tox.ini index cbaa23be1..ad0be152a 100644 --- a/tox.ini +++ b/tox.ini @@ -40,6 +40,6 @@ commands = {posargs} [flake8] ignore = E123,E125,H -select = H231,F +select = H231,H233,F show-source = True exclude = .venv,.tox,dist,doc,build,*.egg