diff --git a/reclass/storage/yamldata.py b/reclass/storage/yamldata.py
index 0dda2b7..ac3dcb9 100644
--- a/reclass/storage/yamldata.py
+++ b/reclass/storage/yamldata.py
@@ -22,11 +22,10 @@
         if not os.access(abs_path, os.R_OK):
             raise NotFoundError('Cannot open: %s' % abs_path)
         y = cls('yaml_fs://{0}'.format(abs_path))
-        fp = file(abs_path)
-        data = yaml.safe_load(fp)
-        if data is not None:
-            y._data = data
-        fp.close()
+        with open(abs_path) as fp:
+            data = yaml.safe_load(fp)
+            if data is not None:
+                y._data = data
         return y
 
     @classmethod