diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py index 8ab5fa50b..1ec589470 100644 --- a/evennia/commands/default/tests.py +++ b/evennia/commands/default/tests.py @@ -2264,6 +2264,7 @@ class TestSystemCommands(BaseEvenniaCommandTest): self.call(multimatch, "look", "") + class TestPreCmdOutputTestable(BaseEvenniaCommandTest): def test_pre_cmd(self): class CmdTest(Command): @@ -2275,4 +2276,4 @@ class TestPreCmdOutputTestable(BaseEvenniaCommandTest): self.msg("This should never be executed") return - self.call(CmdTest(), "test", "This should be testable") \ No newline at end of file + self.call(CmdTest(), "test", "This should be testable") diff --git a/evennia/contrib/base_systems/ingame_reports/menu.py b/evennia/contrib/base_systems/ingame_reports/menu.py index fb25e55bb..da661a438 100644 --- a/evennia/contrib/base_systems/ingame_reports/menu.py +++ b/evennia/contrib/base_systems/ingame_reports/menu.py @@ -45,10 +45,7 @@ def menunode_list_reports(caller, raw_string, **kwargs): new_report_list = report_list.filter(db_tags__db_key=kwargs["status"]) # we don't filter reports if there are no reports under that filter if not new_report_list: - text = _( - "(No {status} reports)\n" - "{text}" - ).format(status=status, text=text) + text = _("(No {status} reports)\n" "{text}").format(status=status, text=text) else: report_list = new_report_list text = _("Managing {status} {hub_name}").format(status=status, hub_name=hub_name) @@ -85,10 +82,12 @@ def menunode_list_reports(caller, raw_string, **kwargs): options.append( { "key": ( - _("|uP|nrevious {_REPORTS_PER_PAGE}").format(_REPORTS_PER_PAGE, _REPORTS_PER_PAGE), + _("|uP|nrevious {_REPORTS_PER_PAGE}").format( + _REPORTS_PER_PAGE, _REPORTS_PER_PAGE + ), _("previous"), _("prev"), - _("p") + _("p"), ), "goto": ( "menunode_list_reports", @@ -102,7 +101,7 @@ def menunode_list_reports(caller, raw_string, **kwargs): "key": ( _("|uN|next {_REPORTS_PER_PAGE}").format(_REPORTS_PER_PAGE=_REPORTS_PER_PAGE), _("next"), - _("n") + _("n"), ), "goto": ( "menunode_list_reports", @@ -151,16 +150,12 @@ def menunode_manage_report(caller, raw_string, report, **kwargs): else: about_clause = "" - text = _( - "{message}\n" - "{timestamp} by {senders}{about_clause}\n" - "{tags}" - ).format( + text = _("{message}\n" "{timestamp} by {senders}{about_clause}\n" "{tags}").format( message=message, timestamp=timestamp, senders=senders_str, about_clause=about_clause, - tags=tags_str + tags=tags_str, ) options = [] diff --git a/evennia/prototypes/tests.py b/evennia/prototypes/tests.py index ca46ad9d8..4fe0c7d59 100644 --- a/evennia/prototypes/tests.py +++ b/evennia/prototypes/tests.py @@ -1119,6 +1119,7 @@ class TestIssue3824(BaseEvenniaTest): self.assertIn(self.room1, objlist) self.assertIn(self.room2, objlist) + class TestIssue3101(EvenniaCommandTest): """ Spawning and using create_object should store the same `typeclass_path` if using diff --git a/evennia/utils/tests/test_batchprocessors.py b/evennia/utils/tests/test_batchprocessors.py index 9bb0812e0..e477c79ac 100644 --- a/evennia/utils/tests/test_batchprocessors.py +++ b/evennia/utils/tests/test_batchprocessors.py @@ -93,6 +93,7 @@ class TestBatchCommandProcessor(TestCase): [mock.call("foopath", file_ending=".ev"), mock.call("x", file_ending=".ev")], ) + class TestReadBatchFile(TestCase): """Test read_batchfile line ending normalization."""