diff --git a/SpiffWorkflow/bpmn/serializer/CompactWorkflowSerializer.py b/SpiffWorkflow/bpmn/serializer/CompactWorkflowSerializer.py index e93bf538..6e9bd8b0 100644 --- a/SpiffWorkflow/bpmn/serializer/CompactWorkflowSerializer.py +++ b/SpiffWorkflow/bpmn/serializer/CompactWorkflowSerializer.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import +from __future__ import print_function # Copyright (C) 2012 Matthew Hampton # # This library is free software; you can redistribute it and/or diff --git a/SpiffWorkflow/specs/WorkflowSpec.py b/SpiffWorkflow/specs/WorkflowSpec.py index e5546ec0..481fdab4 100644 --- a/SpiffWorkflow/specs/WorkflowSpec.py +++ b/SpiffWorkflow/specs/WorkflowSpec.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import +from __future__ import print_function # Copyright (C) 2007 Samuel Abels # # This library is free software; you can redistribute it and/or diff --git a/SpiffWorkflow/specs/base.py b/SpiffWorkflow/specs/base.py index be252249..fec52b65 100644 --- a/SpiffWorkflow/specs/base.py +++ b/SpiffWorkflow/specs/base.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import +from __future__ import print_function # Copyright (C) 2007 Samuel Abels # # This library is free software; you can redistribute it and/or @@ -386,7 +387,7 @@ class TaskSpec(object): assert my_task is not None if my_task.workflow.debug: - print("Executing task:", my_task.get_name()) + print(("Executing task:", my_task.get_name())) self._on_complete_hook(my_task) diff --git a/SpiffWorkflow/task.py b/SpiffWorkflow/task.py index 4748dddd..ad9a72dd 100644 --- a/SpiffWorkflow/task.py +++ b/SpiffWorkflow/task.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import +from __future__ import print_function # Copyright (C) 2007 Samuel Abels # # This library is free software; you can redistribute it and/or diff --git a/SpiffWorkflow/workflow.py b/SpiffWorkflow/workflow.py index 0b30128f..889cb5be 100644 --- a/SpiffWorkflow/workflow.py +++ b/SpiffWorkflow/workflow.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import +from __future__ import print_function # Copyright (C) 2007 Samuel Abels # # This library is free software; you can redistribute it and/or @@ -86,7 +87,7 @@ class Workflow(object): mask = Task.NOT_FINISHED_MASK iter = Task.Iterator(self.task_tree, mask) try: - iter.next() + next(iter) except: # No waiting tasks found. return True @@ -223,7 +224,7 @@ class Workflow(object): if pick_up and self.last_task is not None: try: iter = Task.Iterator(self.last_task, Task.READY) - next = iter.next() + next = next(iter) except: next = None self.last_task = None diff --git a/doc/custom-tasks/strike.py b/doc/custom-tasks/strike.py index 38192a33..7cff565a 100644 --- a/doc/custom-tasks/strike.py +++ b/doc/custom-tasks/strike.py @@ -1,8 +1,9 @@ +from __future__ import print_function from SpiffWorkflow.specs import Simple class NuclearStrike(Simple): def _on_complete_hook(self, my_task): - print(self.my_variable, "sent!") + print((self.my_variable, "sent!")) def serialize(self, serializer): return serializer.serialize_nuclear_strike(self) diff --git a/doc/tutorial/nuclear.py b/doc/tutorial/nuclear.py index 523fd55a..641ac667 100644 --- a/doc/tutorial/nuclear.py +++ b/doc/tutorial/nuclear.py @@ -1,8 +1,9 @@ +from __future__ import print_function from SpiffWorkflow.specs import WorkflowSpec, ExclusiveChoice, Simple, Cancel from SpiffWorkflow.operators import Equal, Attrib def my_nuclear_strike(msg): - print "Launched:", msg + print("Launched:", msg) class NuclearStrikeWorkflowSpec(WorkflowSpec): def __init__(self): diff --git a/setup.py b/setup.py index 797d56bc..e14ec184 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ included with the package. author_email = 'cheeseshop.python.org@debain.org', license = 'lGPLv2', packages = find_packages(exclude=['tests', 'tests.*']), - install_requires = ['lxml'], + install_requires = ['future', 'configparser', 'lxml'], keywords = 'spiff workflow bpmn engine', url = 'https://github.com/knipknap/SpiffWorkflow', classifiers = [