From 1a30079fd4def20aef21c66a897bdb403dd69665 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 15 Jun 2016 20:02:32 +0200
Subject: [PATCH] Fix how the lock command returns strings to avoid a malformed
 AMP send. This (again fixes ##996.

---
 evennia/commands/default/building.py |  2 +-
 evennia/locks/lockhandler.py         | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 733aa97cb3..9ac71c1b75 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1805,7 +1805,7 @@ class CmdLock(ObjManipCommand):
         obj = caller.search(self.lhs)
         if not obj:
             return
-        caller.msg(obj.locks)
+        caller.msg(obj.locks.all())
 
 
 class CmdExamine(ObjManipCommand):
diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index ffe5682693..2344c02698 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -361,6 +361,16 @@ class LockHandler(object):
             return self.locks.get(access_type, ["", "", ""])[2]
         return str(self)
 
+    def all(self):
+        """
+        Return all lockstrings.
+
+        Returns:
+            lockstring (str): The full lockstring
+
+        """
+        return self.get()
+
     def remove(self, access_type):
         """
         Remove a particular lock from the handler