Keep TaskList inside common module

common/__init__.py

@@ -1,5 +1,4 @@
-__all__ = ['Manifest', 'Task', 'TaskList', 'main']
+__all__ = ['Manifest', 'Task', 'main']
 from manifest import Manifest
 from task import Task
-from tasklist import TaskList
 from main import main

common/main.py

@@ -22,7 +22,9 @@ def run(args):
 	manifest.validate()
 	manifest.load_plugins()
 
-	tasklist = provider.tasklist(manifest)
+	from tasklist import TaskList
+	tasklist = TaskList()
+	provider.modify_tasklist(tasklist, manifest)
 	tasklist.plugins(manifest)
 
 	from bootstrapinfo import BootstrapInformation

providers/ec2/__init__.py

@@ -1,18 +1,14 @@
 from manifest import Manifest
 
 
-def tasklist(manifest):
+def modify_tasklist(tasklist, manifest):
-	from common import TaskList
 	from tasks import packages
 	from tasks import ec2
 	from tasks import host
-	task_list = TaskList()
+	tasklist.extend([packages.HostPackages(),
-	task_list.extend([packages.HostPackages(),
+	                 packages.ImagePackages(),
-	                  packages.ImagePackages(),
+	                 ec2.GetCredentials(),
-	                  ec2.GetCredentials(),
+	                 host.GetInfo(),
-	                  host.GetInfo(),
+	                 ec2.Connect(),
-	                  ec2.Connect(),
+	                 host.InstallPackages()
-	                  host.InstallPackages()
+                  ])
-                   ])
-
-	return task_list