Fix unhandled exception in show file command

[mudpy.git] / mudpy / misc.py

diff --git a/mudpy/misc.py b/mudpy/misc.py
index d43a7e2..ebccc26 100644 (file)
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -2133,15 +2133,17 @@ def command_show(actor, parameters):
             message += "$(eol)   $(grn)" + category + "$(nrm)"
     elif arguments[0] == "files":
         message = "These are the current files containing the universe:$(eol)"
-        filenames = list(universe.files.keys())
-        filenames.sort()
+        filenames = sorted(universe.files)
         for filename in filenames:
             if universe.files[filename].is_writeable():
                 status = "rw"
             else:
                 status = "ro"
-            message += ("$(eol)   $(red)(" + status + ") $(grn)" + filename
-                        + "$(nrm)")
+            message += ("$(eol)   $(red)(%s) $(grn)%s$(nrm)" %
+                        (status, filename))
+            if universe.files[filename].flags:
+                message += (" $(yel)[%s]$(nrm)" %
+                            ",".join(universe.files[filename].flags))
     elif arguments[0] == "category":
         if len(arguments) != 2:
             message = "You must specify one category."
@@ -2162,14 +2164,13 @@ def command_show(actor, parameters):
         if len(arguments) != 2:
             message = "You must specify one file."
         elif arguments[1] in universe.files:
-            message = ('These are the elements in the "' + arguments[1]
+            message = ('These are the nodes in the "' + arguments[1]
                        + '" file:$(eol)')
-            elements = universe.files[arguments[1]].data.keys()
-            elements.sort()
+            elements = sorted(universe.files[arguments[1]].data)
             for element in elements:
                 message += "$(eol)   $(grn)" + element + "$(nrm)"
         else:
-            message = 'Category "' + arguments[1] + '" does not exist.'
+            message = 'File "%s" does not exist.' % arguments[1]
     elif arguments[0] == "element":
         if len(arguments) != 2:
             message = "You must specify one element."