Merge branch 'develop' into fix/funcparser

evennia/utils/tests/test_search.py

@@ -1,13 +1,13 @@
-from evennia.scripts.scripts import DefaultScript
-from evennia.utils.test_resources import EvenniaTest
 from evennia import DefaultObject, DefaultRoom
 from evennia.objects.models import ObjectDB
+from evennia.scripts.scripts import DefaultScript
 from evennia.utils.search import (
+    search_script,
     search_script_attribute,
     search_script_tag,
-    search_script,
     search_typeclass,
 )
+from evennia.utils.test_resources import EvenniaTest
 
 
 class TestSearch(EvenniaTest):
@@ -71,12 +71,12 @@ class TestSearch(EvenniaTest):
 
     def test_search_typeclass(self):
         """Check that an object can be found by typeclass"""
-        obj = DefaultObject.create("test_obj")
+        DefaultObject.create("test_obj")
         found = search_typeclass("evennia.objects.objects.DefaultObject")
         self.assertEqual(len(found), 1)
 
     def test_search_wrong_typeclass(self):
         """Check that an object cannot be found by wrong typeclass"""
-        obj = DefaultObject.create("test_obj_2")
-        found = search_typeclass("not.a.typeclass")
-        self.assertEqual(len(found), 0)
+        DefaultObject.create("test_obj_2")
+        with self.assertRaises(ImportError):
+            search_typeclass("not.a.typeclass")