From 90af12849c373d3b729c4d7d84dbb69c2ecd885a Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 12 Nov 2012 15:26:19 -0500 Subject: change the "null datasource" for stages.py to None Previous commit set up an object for checking "None" in the stages class. Here, change that to be None. The benefit of the DataSourceNone was so that the stages was generally functional even with that "None" object. The negative affect of that is that you could go down the error path much longer when using it. If we use None type, then self.datasource. will fail immediately and loudly. --- cloudinit/stages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cloudinit') diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 9c231994..e83d72da 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -49,7 +49,7 @@ from cloudinit import util LOG = logging.getLogger(__name__) -NULL_DATA_SOURCE = DataSourceNone.DataSourceNone({}, None, None) +NULL_DATA_SOURCE = None class Init(object): def __init__(self, ds_deps=None): -- cgit v1.2.3