From af8f006fc682d120924e44ef024a7eee09304f74 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Mon, 10 Oct 2011 16:50:56 +0200
Subject: [PATCH] /type/cdist_type/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 lib/cdist/core/object.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cdist/core/object.py b/lib/cdist/core/object.py
index 2ae5f81b..a3baa941 100644
--- a/lib/cdist/core/object.py
+++ b/lib/cdist/core/object.py
@@ -63,8 +63,8 @@ class Object(object):
             if DOT_CDIST in dirs:
                 yield os.path.relpath(path, object_base_path)
 
-    def __init__(self, type, base_path, object_id=None):
-        self.type = type # instance of Type
+    def __init__(self, cdist_type, base_path, object_id=None):
+        self.type = cdist_type # instance of Type
         self.base_path = base_path
         self.object_id = object_id
         self.name = os.path.join(self.type.name, self.object_id)