From f943b3e1799cdefa79c7cfcb45924e44a601b351 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Tue, 9 Oct 2018 23:41:04 +0000
Subject: [PATCH] Adds create() method to DefaultScript and unit test for
 DefaultScript.create().

---
 evennia/scripts/scripts.py | 28 +++++++++++++++++++++++++++-
 evennia/scripts/tests.py   | 10 ++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/evennia/scripts/scripts.py b/evennia/scripts/scripts.py
index 8bff161cf5..ba6f7edff2 100644
--- a/evennia/scripts/scripts.py
+++ b/evennia/scripts/scripts.py
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext as _
 from evennia.typeclasses.models import TypeclassBase
 from evennia.scripts.models import ScriptDB
 from evennia.scripts.manager import ScriptManager
-from evennia.utils import logger
+from evennia.utils import create, logger
 from future.utils import with_metaclass
 
 __all__ = ["DefaultScript", "DoNothing", "Store"]
@@ -323,6 +323,32 @@ class DefaultScript(ScriptBase):
     or describe a state that changes under certain conditions.
 
     """
+    
+    @classmethod
+    def create(cls, key, **kwargs):
+        """
+        Provides a passthrough interface to the utils.create_script() function.
+        
+        Args:
+            key (str): Name of the new object.
+        
+        Returns:
+            object (Object): A newly created object of the given typeclass.
+            errors (list): A list of errors in string form, if any.
+        
+        """
+        errors = []
+        obj = None
+        
+        kwargs['key'] = key
+        
+        try:
+            obj = create.create_script(**kwargs)
+        except Exception as e:
+            errors.append("The script '%s' encountered errors and could not be created." % key)
+            logger.log_err(e)
+            
+        return obj, errors
 
     def at_script_creation(self):
         """
diff --git a/evennia/scripts/tests.py b/evennia/scripts/tests.py
index dbd36ae956..f5120d0da5 100644
--- a/evennia/scripts/tests.py
+++ b/evennia/scripts/tests.py
@@ -1,10 +1,20 @@
 # this is an optimized version only available in later Django versions
 from unittest import TestCase
+from evennia import DefaultScript
 from evennia.scripts.models import ScriptDB, ObjectDoesNotExist
 from evennia.utils.create import create_script
+from evennia.utils.test_resources import EvenniaTest
 from evennia.scripts.scripts import DoNothing
 
 
+class TestScript(EvenniaTest):
+    
+    def test_create(self):
+        "Check the script can be created via the convenience method."
+        obj, errors = DefaultScript.create('useless-machine')
+        self.assertTrue(obj, errors)
+        self.assertFalse(errors, errors)
+
 class TestScriptDB(TestCase):
     "Check the singleton/static ScriptDB object works correctly"