X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=mudpy%2Fdata.py;h=eeea8fb9530e1b07f41678f2177e03038c7e4f13;hb=HEAD;hp=637104598974b8aa80f8c22ffc60dc55f2926c8d;hpb=7dcd8a59f035d8762dc028e7062de2883b1c89c2;p=mudpy.git

diff --git a/mudpy/data.py b/mudpy/data.py
index 6371045..b45cd67 100644
--- a/mudpy/data.py
+++ b/mudpy/data.py
@@ -1,8 +1,8 @@
 """Data interface functions for the mudpy engine."""
 
-# Copyright (c) 2004-2018 Jeremy Stanley <fungi@yuggoth.org>. Permission
-# to use, copy, modify, and distribute this software is granted under
-# terms provided in the LICENSE file distributed with this software.
+# Copyright (c) 2004-2022 mudpy authors. Permission to use, copy,
+# modify, and distribute this software is granted under terms
+# provided in the LICENSE file distributed with this software.
 
 import os
 import re
@@ -57,12 +57,14 @@ class Data:
         self.source = find_file(
                 self.source, relative=self.relative, universe=self.universe)
         try:
-            self.data = yaml.safe_load(open(self.source))
+            with open(self.source) as datafd:
+                self.data = yaml.safe_load(datafd)
             log_entry = ("Loaded file %s into memory." % self.source, 5)
         except FileNotFoundError:
             # it's normal if the file is one which doesn't exist yet
             self.data = {}
-            log_entry = ("File %s is unavailable." % self.source, 6)
+            log_entry = (
+                "File %s was not found and will be created." % self.source, 6)
         try:
             mudpy.misc.log(*log_entry)
         except NameError:
@@ -74,13 +76,7 @@ class Data:
         includes = []
         for node in list(self.data):
             if node == "_load":
-                for included in self.data["_load"]:
-                    included = find_file(
-                        included,
-                        relative=self.source,
-                        universe=self.universe)
-                    if included not in includes:
-                        includes.append(included)
+                includes += self.data["_load"]
                 continue
             if node.startswith("_"):
                 continue
@@ -117,10 +113,9 @@ class Data:
            ):
 
             # make parent directories if necessary
-            if not os.path.exists(os.path.dirname(self.source)):
-                old_umask = os.umask(normal_umask)
-                os.makedirs(os.path.dirname(self.source))
-                os.umask(old_umask)
+            old_umask = os.umask(normal_umask)
+            os.makedirs(os.path.dirname(self.source), exist_ok=True)
+            os.umask(old_umask)
 
             # backup the file
             if "mudpy.limit" in self.universe.contents: