diff --git a/README.md b/README.md index f7dd7f1e72..5e2e543f2f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Evennia MUD/MU\* Creation System ![][logo] -[![Build Status][unittestciimg]][unittestcilink] [![Coverage Status][coverimg]][coverlink] +[![Build Status][unittestciimg]][unittestcilink] [![Coverage Status][coverimg]][coverlink] [![Pypi Version][pypibadge]][pypilink] [Evennia][homepage] is a modern library for creating [online multiplayer text @@ -50,6 +50,8 @@ Welcome! [unittestcilink]: https://github.com/evennia/evennia/actions?query=workflow%3Atest-suite [coverimg]: https://coveralls.io/repos/github/evennia/evennia/badge.svg?branch=master [coverlink]: https://coveralls.io/github/evennia/evennia?branch=master +[pypibadge]: https://img.shields.io/pypi/v/evennia?color=blue +[pypilink]: https://pypi.org/project/evennia/ [introduction]: https://www.evennia.com/docs/latest/Evennia-Introduction.html [license]: https://www.evennia.com/docs/latest/Licensing.html [group]: https://github.com/evennia/evennia/discussions diff --git a/evennia/accounts/bots.py b/evennia/accounts/bots.py index a732532c81..7fec46fb81 100644 --- a/evennia/accounts/bots.py +++ b/evennia/accounts/bots.py @@ -8,6 +8,7 @@ import time from django.conf import settings from django.utils.translation import gettext as _ + from evennia.accounts.accounts import DefaultAccount from evennia.scripts.scripts import DefaultScript from evennia.utils import logger, search, utils diff --git a/evennia/contrib/base_systems/godotwebsocket/__init__.py b/evennia/contrib/base_systems/godotwebsocket/__init__.py index c6b9827538..8311d5d7da 100644 --- a/evennia/contrib/base_systems/godotwebsocket/__init__.py +++ b/evennia/contrib/base_systems/godotwebsocket/__init__.py @@ -10,5 +10,8 @@ You could also pass extra data to this client for advanced functionality. See the docs for more information. """ -from evennia.contrib.base_systems.godotwebsocket.text2bbcode import parse_to_bbcode, BBCODE_PARSER +from evennia.contrib.base_systems.godotwebsocket.text2bbcode import ( + BBCODE_PARSER, + parse_to_bbcode, +) from evennia.contrib.base_systems.godotwebsocket.webclient import GodotWebSocketClient diff --git a/evennia/contrib/base_systems/godotwebsocket/test_text2bbcode.py b/evennia/contrib/base_systems/godotwebsocket/test_text2bbcode.py index 3b19245d6e..cddcd8ef41 100644 --- a/evennia/contrib/base_systems/godotwebsocket/test_text2bbcode.py +++ b/evennia/contrib/base_systems/godotwebsocket/test_text2bbcode.py @@ -12,17 +12,17 @@ class TestText2Bbcode(TestCase): parser = text2bbcode.BBCODE_PARSER self.assertEqual("foo", parser.format_styles("foo")) self.assertEqual( - '[color=#800000]red[/color]foo', + "[color=#800000]red[/color]foo", parser.format_styles( ansi.ANSI_UNHILITE + ansi.ANSI_RED + "red" + ansi.ANSI_NORMAL + "foo" ), ) self.assertEqual( - '[bgcolor=#800000]red[/bgcolor]foo', + "[bgcolor=#800000]red[/bgcolor]foo", parser.format_styles(ansi.ANSI_BACK_RED + "red" + ansi.ANSI_NORMAL + "foo"), ) self.assertEqual( - '[bgcolor=#800000][color=#008000]red[/color][/bgcolor]foo', + "[bgcolor=#800000][color=#008000]red[/color][/bgcolor]foo", parser.format_styles( ansi.ANSI_BACK_RED + ansi.ANSI_UNHILITE @@ -33,15 +33,15 @@ class TestText2Bbcode(TestCase): ), ) self.assertEqual( - 'a [u]red[/u]foo', + "a [u]red[/u]foo", parser.format_styles("a " + ansi.ANSI_UNDERLINE + "red" + ansi.ANSI_NORMAL + "foo"), ) self.assertEqual( - 'a [blink]red[/blink]foo', + "a [blink]red[/blink]foo", parser.format_styles("a " + ansi.ANSI_BLINK + "red" + ansi.ANSI_NORMAL + "foo"), ) self.assertEqual( - 'a [bgcolor=#c0c0c0][color=#000000]red[/color][/bgcolor]foo', + "a [bgcolor=#c0c0c0][color=#000000]red[/color][/bgcolor]foo", parser.format_styles("a " + ansi.ANSI_INVERSE + "red" + ansi.ANSI_NORMAL + "foo"), ) @@ -49,7 +49,7 @@ class TestText2Bbcode(TestCase): parser = text2bbcode.BBCODE_PARSER self.assertEqual("foo", parser.convert_urls("foo")) self.assertEqual( - 'a [url=http://redfoo]http://redfoo[/url] runs', + "a [url=http://redfoo]http://redfoo[/url] runs", parser.convert_urls("a http://redfoo runs"), ) @@ -68,18 +68,17 @@ class TestText2Bbcode(TestCase): mocked_match.groupdict.return_value = {"lineend": "foo"} self.assertEqual("\n", parser.sub_text(mocked_match)) - def test_parse_bbcode(self): self.assertEqual("foo", text2bbcode.parse_to_bbcode("foo")) self.maxDiff = None self.assertEqual( text2bbcode.parse_to_bbcode("|^|[CHello|n|u|rW|go|yr|bl|md|c!|[G!"), - '[blink][bgcolor=#008080]Hello[/bgcolor][/blink]' - '[u][color=#ff0000]W[/color][/u]' - '[u][color=#00ff00]o[/color][/u]' - '[u][color=#ffff00]r[/color][/u]' - '[u][color=#0000ff]l[/color][/u]' - '[u][color=#ff00ff]d[/color][/u]' - '[u][color=#00ffff]![/color][/u]' - '[u][bgcolor=#008000][color=#00ffff]![/color][/bgcolor][/u]', + "[blink][bgcolor=#008080]Hello[/bgcolor][/blink]" + "[u][color=#ff0000]W[/color][/u]" + "[u][color=#00ff00]o[/color][/u]" + "[u][color=#ffff00]r[/color][/u]" + "[u][color=#0000ff]l[/color][/u]" + "[u][color=#ff00ff]d[/color][/u]" + "[u][color=#00ffff]![/color][/u]" + "[u][bgcolor=#008000][color=#00ffff]![/color][/bgcolor][/u]", ) diff --git a/evennia/contrib/base_systems/godotwebsocket/text2bbcode.py b/evennia/contrib/base_systems/godotwebsocket/text2bbcode.py index b5a748b30d..ac16fb2743 100644 --- a/evennia/contrib/base_systems/godotwebsocket/text2bbcode.py +++ b/evennia/contrib/base_systems/godotwebsocket/text2bbcode.py @@ -12,156 +12,518 @@ XTERM256_FG = "\033[38;5;{}m" XTERM256_BG = "\033[48;5;{}m" COLOR_INDICE_TO_HEX = { - 'color-000': '#000000', 'color-001': '#800000', 'color-002': '#008000', 'color-003': '#808000', - 'color-004': '#000080', 'color-005': '#800080', 'color-006': '#008080', 'color-007': '#c0c0c0', - 'color-008': '#808080', 'color-009': '#ff0000', 'color-010': '#00ff00', 'color-011': '#ffff00', - 'color-012': '#0000ff', 'color-013': '#ff00ff', 'color-014': '#00ffff', 'color-015': '#ffffff', - 'color-016': '#000000', 'color-017': '#00005f', 'color-018': '#000087', 'color-019': '#0000af', - 'color-020': '#0000df', 'color-021': '#0000ff', 'color-022': '#005f00', 'color-023': '#005f5f', - 'color-024': '#005f87', 'color-025': '#005faf', 'color-026': '#005fdf', 'color-027': '#005fff', - 'color-028': '#008700', 'color-029': '#00875f', 'color-030': '#008787', 'color-031': '#0087af', - 'color-032': '#0087df', 'color-033': '#0087ff', 'color-034': '#00af00', 'color-035': '#00af5f', - 'color-036': '#00af87', 'color-037': '#00afaf', 'color-038': '#00afdf', 'color-039': '#00afff', - 'color-040': '#00df00', 'color-041': '#00df5f', 'color-042': '#00df87', 'color-043': '#00dfaf', - 'color-044': '#00dfdf', 'color-045': '#00dfff', 'color-046': '#00ff00', 'color-047': '#00ff5f', - 'color-048': '#00ff87', 'color-049': '#00ffaf', 'color-050': '#00ffdf', 'color-051': '#00ffff', - 'color-052': '#5f0000', 'color-053': '#5f005f', 'color-054': '#5f0087', 'color-055': '#5f00af', - 'color-056': '#5f00df', 'color-057': '#5f00ff', 'color-058': '#5f5f00', 'color-059': '#5f5f5f', - 'color-060': '#5f5f87', 'color-061': '#5f5faf', 'color-062': '#5f5fdf', 'color-063': '#5f5fff', - 'color-064': '#5f8700', 'color-065': '#5f875f', 'color-066': '#5f8787', 'color-067': '#5f87af', - 'color-068': '#5f87df', 'color-069': '#5f87ff', 'color-070': '#5faf00', 'color-071': '#5faf5f', - 'color-072': '#5faf87', 'color-073': '#5fafaf', 'color-074': '#5fafdf', 'color-075': '#5fafff', - 'color-076': '#5fdf00', 'color-077': '#5fdf5f', 'color-078': '#5fdf87', 'color-079': '#5fdfaf', - 'color-080': '#5fdfdf', 'color-081': '#5fdfff', 'color-082': '#5fff00', 'color-083': '#5fff5f', - 'color-084': '#5fff87', 'color-085': '#5fffaf', 'color-086': '#5fffdf', 'color-087': '#5fffff', - 'color-088': '#870000', 'color-089': '#87005f', 'color-090': '#870087', 'color-091': '#8700af', - 'color-092': '#8700df', 'color-093': '#8700ff', 'color-094': '#875f00', 'color-095': '#875f5f', - 'color-096': '#875f87', 'color-097': '#875faf', 'color-098': '#875fdf', 'color-099': '#875fff', - 'color-100': '#878700', 'color-101': '#87875f', 'color-102': '#878787', 'color-103': '#8787af', - 'color-104': '#8787df', 'color-105': '#8787ff', 'color-106': '#87af00', 'color-107': '#87af5f', - 'color-108': '#87af87', 'color-109': '#87afaf', 'color-110': '#87afdf', 'color-111': '#87afff', - 'color-112': '#87df00', 'color-113': '#87df5f', 'color-114': '#87df87', 'color-115': '#87dfaf', - 'color-116': '#87dfdf', 'color-117': '#87dfff', 'color-118': '#87ff00', 'color-119': '#87ff5f', - 'color-120': '#87ff87', 'color-121': '#87ffaf', 'color-122': '#87ffdf', 'color-123': '#87ffff', - 'color-124': '#af0000', 'color-125': '#af005f', 'color-126': '#af0087', 'color-127': '#af00af', - 'color-128': '#af00df', 'color-129': '#af00ff', 'color-130': '#af5f00', 'color-131': '#af5f5f', - 'color-132': '#af5f87', 'color-133': '#af5faf', 'color-134': '#af5fdf', 'color-135': '#af5fff', - 'color-136': '#af8700', 'color-137': '#af875f', 'color-138': '#af8787', 'color-139': '#af87af', - 'color-140': '#af87df', 'color-141': '#af87ff', 'color-142': '#afaf00', 'color-143': '#afaf5f', - 'color-144': '#afaf87', 'color-145': '#afafaf', 'color-146': '#afafdf', 'color-147': '#afafff', - 'color-148': '#afdf00', 'color-149': '#afdf5f', 'color-150': '#afdf87', 'color-151': '#afdfaf', - 'color-152': '#afdfdf', 'color-153': '#afdfff', 'color-154': '#afff00', 'color-155': '#afff5f', - 'color-156': '#afff87', 'color-157': '#afffaf', 'color-158': '#afffdf', 'color-159': '#afffff', - 'color-160': '#df0000', 'color-161': '#df005f', 'color-162': '#df0087', 'color-163': '#df00af', - 'color-164': '#df00df', 'color-165': '#df00ff', 'color-166': '#df5f00', 'color-167': '#df5f5f', - 'color-168': '#df5f87', 'color-169': '#df5faf', 'color-170': '#df5fdf', 'color-171': '#df5fff', - 'color-172': '#df8700', 'color-173': '#df875f', 'color-174': '#df8787', 'color-175': '#df87af', - 'color-176': '#df87df', 'color-177': '#df87ff', 'color-178': '#dfaf00', 'color-179': '#dfaf5f', - 'color-180': '#dfaf87', 'color-181': '#dfafaf', 'color-182': '#dfafdf', 'color-183': '#dfafff', - 'color-184': '#dfdf00', 'color-185': '#dfdf5f', 'color-186': '#dfdf87', 'color-187': '#dfdfaf', - 'color-188': '#dfdfdf', 'color-189': '#dfdfff', 'color-190': '#dfff00', 'color-191': '#dfff5f', - 'color-192': '#dfff87', 'color-193': '#dfffaf', 'color-194': '#dfffdf', 'color-195': '#dfffff', - 'color-196': '#ff0000', 'color-197': '#ff005f', 'color-198': '#ff0087', 'color-199': '#ff00af', - 'color-200': '#ff00df', 'color-201': '#ff00ff', 'color-202': '#ff5f00', 'color-203': '#ff5f5f', - 'color-204': '#ff5f87', 'color-205': '#ff5faf', 'color-206': '#ff5fdf', 'color-207': '#ff5fff', - 'color-208': '#ff8700', 'color-209': '#ff875f', 'color-210': '#ff8787', 'color-211': '#ff87af', - 'color-212': '#ff87df', 'color-213': '#ff87ff', 'color-214': '#ffaf00', 'color-215': '#ffaf5f', - 'color-216': '#ffaf87', 'color-217': '#ffafaf', 'color-218': '#ffafdf', 'color-219': '#ffafff', - 'color-220': '#ffdf00', 'color-221': '#ffdf5f', 'color-222': '#ffdf87', 'color-223': '#ffdfaf', - 'color-224': '#ffdfdf', 'color-225': '#ffdfff', 'color-226': '#ffff00', 'color-227': '#ffff5f', - 'color-228': '#ffff87', 'color-229': '#ffffaf', 'color-230': '#ffffdf', 'color-231': '#ffffff', - 'color-232': '#080808', 'color-233': '#121212', 'color-234': '#1c1c1c', 'color-235': '#262626', - 'color-236': '#303030', 'color-237': '#3a3a3a', 'color-238': '#444444', 'color-239': '#4e4e4e', - 'color-240': '#585858', 'color-241': '#606060', 'color-242': '#666666', 'color-243': '#767676', - 'color-244': '#808080', 'color-245': '#8a8a8a', 'color-246': '#949494', 'color-247': '#9e9e9e', - 'color-248': '#a8a8a8', 'color-249': '#b2b2b2', 'color-250': '#bcbcbc', 'color-251': '#c6c6c6', - 'color-252': '#d0d0d0', 'color-253': '#dadada', 'color-254': '#e4e4e4', 'color-255': '#eeeeee', - 'bgcolor-000': '#000000', 'bgcolor-001': '#800000', 'bgcolor-002': '#008000', - 'bgcolor-003': '#808000', 'bgcolor-004': '#000080', 'bgcolor-005': '#800080', - 'bgcolor-006': '#008080', 'bgcolor-007': '#c0c0c0', 'bgcolor-008': '#808080', - 'bgcolor-009': '#ff0000', 'bgcolor-010': '#00ff00', 'bgcolor-011': '#ffff00', - 'bgcolor-012': '#0000ff', 'bgcolor-013': '#ff00ff', 'bgcolor-014': '#00ffff', - 'bgcolor-015': '#ffffff', 'bgcolor-016': '#000000', 'bgcolor-017': '#00005f', - 'bgcolor-018': '#000087', 'bgcolor-019': '#0000af', 'bgcolor-020': '#0000df', - 'bgcolor-021': '#0000ff', 'bgcolor-022': '#005f00', 'bgcolor-023': '#005f5f', - 'bgcolor-024': '#005f87', 'bgcolor-025': '#005faf', 'bgcolor-026': '#005fdf', - 'bgcolor-027': '#005fff', 'bgcolor-028': '#008700', 'bgcolor-029': '#00875f', - 'bgcolor-030': '#008787', 'bgcolor-031': '#0087af', 'bgcolor-032': '#0087df', - 'bgcolor-033': '#0087ff', 'bgcolor-034': '#00af00', 'bgcolor-035': '#00af5f', - 'bgcolor-036': '#00af87', 'bgcolor-037': '#00afaf', 'bgcolor-038': '#00afdf', - 'bgcolor-039': '#00afff', 'bgcolor-040': '#00df00', 'bgcolor-041': '#00df5f', - 'bgcolor-042': '#00df87', 'bgcolor-043': '#00dfaf', 'bgcolor-044': '#00dfdf', - 'bgcolor-045': '#00dfff', 'bgcolor-046': '#00ff00', 'bgcolor-047': '#00ff5f', - 'bgcolor-048': '#00ff87', 'bgcolor-049': '#00ffaf', 'bgcolor-050': '#00ffdf', - 'bgcolor-051': '#00ffff', 'bgcolor-052': '#5f0000', 'bgcolor-053': '#5f005f', - 'bgcolor-054': '#5f0087', 'bgcolor-055': '#5f00af', 'bgcolor-056': '#5f00df', - 'bgcolor-057': '#5f00ff', 'bgcolor-058': '#5f5f00', 'bgcolor-059': '#5f5f5f', - 'bgcolor-060': '#5f5f87', 'bgcolor-061': '#5f5faf', 'bgcolor-062': '#5f5fdf', - 'bgcolor-063': '#5f5fff', 'bgcolor-064': '#5f8700', 'bgcolor-065': '#5f875f', - 'bgcolor-066': '#5f8787', 'bgcolor-067': '#5f87af', 'bgcolor-068': '#5f87df', - 'bgcolor-069': '#5f87ff', 'bgcolor-070': '#5faf00', 'bgcolor-071': '#5faf5f', - 'bgcolor-072': '#5faf87', 'bgcolor-073': '#5fafaf', 'bgcolor-074': '#5fafdf', - 'bgcolor-075': '#5fafff', 'bgcolor-076': '#5fdf00', 'bgcolor-077': '#5fdf5f', - 'bgcolor-078': '#5fdf87', 'bgcolor-079': '#5fdfaf', 'bgcolor-080': '#5fdfdf', - 'bgcolor-081': '#5fdfff', 'bgcolor-082': '#5fff00', 'bgcolor-083': '#5fff5f', - 'bgcolor-084': '#5fff87', 'bgcolor-085': '#5fffaf', 'bgcolor-086': '#5fffdf', - 'bgcolor-087': '#5fffff', 'bgcolor-088': '#870000', 'bgcolor-089': '#87005f', - 'bgcolor-090': '#870087', 'bgcolor-091': '#8700af', 'bgcolor-092': '#8700df', - 'bgcolor-093': '#8700ff', 'bgcolor-094': '#875f00', 'bgcolor-095': '#875f5f', - 'bgcolor-096': '#875f87', 'bgcolor-097': '#875faf', 'bgcolor-098': '#875fdf', - 'bgcolor-099': '#875fff', 'bgcolor-100': '#878700', 'bgcolor-101': '#87875f', - 'bgcolor-102': '#878787', 'bgcolor-103': '#8787af', 'bgcolor-104': '#8787df', - 'bgcolor-105': '#8787ff', 'bgcolor-106': '#87af00', 'bgcolor-107': '#87af5f', - 'bgcolor-108': '#87af87', 'bgcolor-109': '#87afaf', 'bgcolor-110': '#87afdf', - 'bgcolor-111': '#87afff', 'bgcolor-112': '#87df00', 'bgcolor-113': '#87df5f', - 'bgcolor-114': '#87df87', 'bgcolor-115': '#87dfaf', 'bgcolor-116': '#87dfdf', - 'bgcolor-117': '#87dfff', 'bgcolor-118': '#87ff00', 'bgcolor-119': '#87ff5f', - 'bgcolor-120': '#87ff87', 'bgcolor-121': '#87ffaf', 'bgcolor-122': '#87ffdf', - 'bgcolor-123': '#87ffff', 'bgcolor-124': '#af0000', 'bgcolor-125': '#af005f', - 'bgcolor-126': '#af0087', 'bgcolor-127': '#af00af', 'bgcolor-128': '#af00df', - 'bgcolor-129': '#af00ff', 'bgcolor-130': '#af5f00', 'bgcolor-131': '#af5f5f', - 'bgcolor-132': '#af5f87', 'bgcolor-133': '#af5faf', 'bgcolor-134': '#af5fdf', - 'bgcolor-135': '#af5fff', 'bgcolor-136': '#af8700', 'bgcolor-137': '#af875f', - 'bgcolor-138': '#af8787', 'bgcolor-139': '#af87af', 'bgcolor-140': '#af87df', - 'bgcolor-141': '#af87ff', 'bgcolor-142': '#afaf00', 'bgcolor-143': '#afaf5f', - 'bgcolor-144': '#afaf87', 'bgcolor-145': '#afafaf', 'bgcolor-146': '#afafdf', - 'bgcolor-147': '#afafff', 'bgcolor-148': '#afdf00', 'bgcolor-149': '#afdf5f', - 'bgcolor-150': '#afdf87', 'bgcolor-151': '#afdfaf', 'bgcolor-152': '#afdfdf', - 'bgcolor-153': '#afdfff', 'bgcolor-154': '#afff00', 'bgcolor-155': '#afff5f', - 'bgcolor-156': '#afff87', 'bgcolor-157': '#afffaf', 'bgcolor-158': '#afffdf', - 'bgcolor-159': '#afffff', 'bgcolor-160': '#df0000', 'bgcolor-161': '#df005f', - 'bgcolor-162': '#df0087', 'bgcolor-163': '#df00af', 'bgcolor-164': '#df00df', - 'bgcolor-165': '#df00ff', 'bgcolor-166': '#df5f00', 'bgcolor-167': '#df5f5f', - 'bgcolor-168': '#df5f87', 'bgcolor-169': '#df5faf', 'bgcolor-170': '#df5fdf', - 'bgcolor-171': '#df5fff', 'bgcolor-172': '#df8700', 'bgcolor-173': '#df875f', - 'bgcolor-174': '#df8787', 'bgcolor-175': '#df87af', 'bgcolor-176': '#df87df', - 'bgcolor-177': '#df87ff', 'bgcolor-178': '#dfaf00', 'bgcolor-179': '#dfaf5f', - 'bgcolor-180': '#dfaf87', 'bgcolor-181': '#dfafaf', 'bgcolor-182': '#dfafdf', - 'bgcolor-183': '#dfafff', 'bgcolor-184': '#dfdf00', 'bgcolor-185': '#dfdf5f', - 'bgcolor-186': '#dfdf87', 'bgcolor-187': '#dfdfaf', 'bgcolor-188': '#dfdfdf', - 'bgcolor-189': '#dfdfff', 'bgcolor-190': '#dfff00', 'bgcolor-191': '#dfff5f', - 'bgcolor-192': '#dfff87', 'bgcolor-193': '#dfffaf', 'bgcolor-194': '#dfffdf', - 'bgcolor-195': '#dfffff', 'bgcolor-196': '#ff0000', 'bgcolor-197': '#ff005f', - 'bgcolor-198': '#ff0087', 'bgcolor-199': '#ff00af', 'bgcolor-200': '#ff00df', - 'bgcolor-201': '#ff00ff', 'bgcolor-202': '#ff5f00', 'bgcolor-203': '#ff5f5f', - 'bgcolor-204': '#ff5f87', 'bgcolor-205': '#ff5faf', 'bgcolor-206': '#ff5fdf', - 'bgcolor-207': '#ff5fff', 'bgcolor-208': '#ff8700', 'bgcolor-209': '#ff875f', - 'bgcolor-210': '#ff8787', 'bgcolor-211': '#ff87af', 'bgcolor-212': '#ff87df', - 'bgcolor-213': '#ff87ff', 'bgcolor-214': '#ffaf00', 'bgcolor-215': '#ffaf5f', - 'bgcolor-216': '#ffaf87', 'bgcolor-217': '#ffafaf', 'bgcolor-218': '#ffafdf', - 'bgcolor-219': '#ffafff', 'bgcolor-220': '#ffdf00', 'bgcolor-221': '#ffdf5f', - 'bgcolor-222': '#ffdf87', 'bgcolor-223': '#ffdfaf', 'bgcolor-224': '#ffdfdf', - 'bgcolor-225': '#ffdfff', 'bgcolor-226': '#ffff00', 'bgcolor-227': '#ffff5f', - 'bgcolor-228': '#ffff87', 'bgcolor-229': '#ffffaf', 'bgcolor-230': '#ffffdf', - 'bgcolor-231': '#ffffff', 'bgcolor-232': '#080808', 'bgcolor-233': '#121212', - 'bgcolor-234': '#1c1c1c', 'bgcolor-235': '#262626', 'bgcolor-236': '#303030', - 'bgcolor-237': '#3a3a3a', 'bgcolor-238': '#444444', 'bgcolor-239': '#4e4e4e', - 'bgcolor-240': '#585858', 'bgcolor-241': '#606060', 'bgcolor-242': '#666666', - 'bgcolor-243': '#767676', 'bgcolor-244': '#808080', 'bgcolor-245': '#8a8a8a', - 'bgcolor-246': '#949494', 'bgcolor-247': '#9e9e9e', 'bgcolor-248': '#a8a8a8', - 'bgcolor-249': '#b2b2b2', 'bgcolor-250': '#bcbcbc', 'bgcolor-251': '#c6c6c6', - 'bgcolor-252': '#d0d0d0', 'bgcolor-253': '#dadada', 'bgcolor-254': '#e4e4e4', - 'bgcolor-255': '#eeeeee' + "color-000": "#000000", + "color-001": "#800000", + "color-002": "#008000", + "color-003": "#808000", + "color-004": "#000080", + "color-005": "#800080", + "color-006": "#008080", + "color-007": "#c0c0c0", + "color-008": "#808080", + "color-009": "#ff0000", + "color-010": "#00ff00", + "color-011": "#ffff00", + "color-012": "#0000ff", + "color-013": "#ff00ff", + "color-014": "#00ffff", + "color-015": "#ffffff", + "color-016": "#000000", + "color-017": "#00005f", + "color-018": "#000087", + "color-019": "#0000af", + "color-020": "#0000df", + "color-021": "#0000ff", + "color-022": "#005f00", + "color-023": "#005f5f", + "color-024": "#005f87", + "color-025": "#005faf", + "color-026": "#005fdf", + "color-027": "#005fff", + "color-028": "#008700", + "color-029": "#00875f", + "color-030": "#008787", + "color-031": "#0087af", + "color-032": "#0087df", + "color-033": "#0087ff", + "color-034": "#00af00", + "color-035": "#00af5f", + "color-036": "#00af87", + "color-037": "#00afaf", + "color-038": "#00afdf", + "color-039": "#00afff", + "color-040": "#00df00", + "color-041": "#00df5f", + "color-042": "#00df87", + "color-043": "#00dfaf", + "color-044": "#00dfdf", + "color-045": "#00dfff", + "color-046": "#00ff00", + "color-047": "#00ff5f", + "color-048": "#00ff87", + "color-049": "#00ffaf", + "color-050": "#00ffdf", + "color-051": "#00ffff", + "color-052": "#5f0000", + "color-053": "#5f005f", + "color-054": "#5f0087", + "color-055": "#5f00af", + "color-056": "#5f00df", + "color-057": "#5f00ff", + "color-058": "#5f5f00", + "color-059": "#5f5f5f", + "color-060": "#5f5f87", + "color-061": "#5f5faf", + "color-062": "#5f5fdf", + "color-063": "#5f5fff", + "color-064": "#5f8700", + "color-065": "#5f875f", + "color-066": "#5f8787", + "color-067": "#5f87af", + "color-068": "#5f87df", + "color-069": "#5f87ff", + "color-070": "#5faf00", + "color-071": "#5faf5f", + "color-072": "#5faf87", + "color-073": "#5fafaf", + "color-074": "#5fafdf", + "color-075": "#5fafff", + "color-076": "#5fdf00", + "color-077": "#5fdf5f", + "color-078": "#5fdf87", + "color-079": "#5fdfaf", + "color-080": "#5fdfdf", + "color-081": "#5fdfff", + "color-082": "#5fff00", + "color-083": "#5fff5f", + "color-084": "#5fff87", + "color-085": "#5fffaf", + "color-086": "#5fffdf", + "color-087": "#5fffff", + "color-088": "#870000", + "color-089": "#87005f", + "color-090": "#870087", + "color-091": "#8700af", + "color-092": "#8700df", + "color-093": "#8700ff", + "color-094": "#875f00", + "color-095": "#875f5f", + "color-096": "#875f87", + "color-097": "#875faf", + "color-098": "#875fdf", + "color-099": "#875fff", + "color-100": "#878700", + "color-101": "#87875f", + "color-102": "#878787", + "color-103": "#8787af", + "color-104": "#8787df", + "color-105": "#8787ff", + "color-106": "#87af00", + "color-107": "#87af5f", + "color-108": "#87af87", + "color-109": "#87afaf", + "color-110": "#87afdf", + "color-111": "#87afff", + "color-112": "#87df00", + "color-113": "#87df5f", + "color-114": "#87df87", + "color-115": "#87dfaf", + "color-116": "#87dfdf", + "color-117": "#87dfff", + "color-118": "#87ff00", + "color-119": "#87ff5f", + "color-120": "#87ff87", + "color-121": "#87ffaf", + "color-122": "#87ffdf", + "color-123": "#87ffff", + "color-124": "#af0000", + "color-125": "#af005f", + "color-126": "#af0087", + "color-127": "#af00af", + "color-128": "#af00df", + "color-129": "#af00ff", + "color-130": "#af5f00", + "color-131": "#af5f5f", + "color-132": "#af5f87", + "color-133": "#af5faf", + "color-134": "#af5fdf", + "color-135": "#af5fff", + "color-136": "#af8700", + "color-137": "#af875f", + "color-138": "#af8787", + "color-139": "#af87af", + "color-140": "#af87df", + "color-141": "#af87ff", + "color-142": "#afaf00", + "color-143": "#afaf5f", + "color-144": "#afaf87", + "color-145": "#afafaf", + "color-146": "#afafdf", + "color-147": "#afafff", + "color-148": "#afdf00", + "color-149": "#afdf5f", + "color-150": "#afdf87", + "color-151": "#afdfaf", + "color-152": "#afdfdf", + "color-153": "#afdfff", + "color-154": "#afff00", + "color-155": "#afff5f", + "color-156": "#afff87", + "color-157": "#afffaf", + "color-158": "#afffdf", + "color-159": "#afffff", + "color-160": "#df0000", + "color-161": "#df005f", + "color-162": "#df0087", + "color-163": "#df00af", + "color-164": "#df00df", + "color-165": "#df00ff", + "color-166": "#df5f00", + "color-167": "#df5f5f", + "color-168": "#df5f87", + "color-169": "#df5faf", + "color-170": "#df5fdf", + "color-171": "#df5fff", + "color-172": "#df8700", + "color-173": "#df875f", + "color-174": "#df8787", + "color-175": "#df87af", + "color-176": "#df87df", + "color-177": "#df87ff", + "color-178": "#dfaf00", + "color-179": "#dfaf5f", + "color-180": "#dfaf87", + "color-181": "#dfafaf", + "color-182": "#dfafdf", + "color-183": "#dfafff", + "color-184": "#dfdf00", + "color-185": "#dfdf5f", + "color-186": "#dfdf87", + "color-187": "#dfdfaf", + "color-188": "#dfdfdf", + "color-189": "#dfdfff", + "color-190": "#dfff00", + "color-191": "#dfff5f", + "color-192": "#dfff87", + "color-193": "#dfffaf", + "color-194": "#dfffdf", + "color-195": "#dfffff", + "color-196": "#ff0000", + "color-197": "#ff005f", + "color-198": "#ff0087", + "color-199": "#ff00af", + "color-200": "#ff00df", + "color-201": "#ff00ff", + "color-202": "#ff5f00", + "color-203": "#ff5f5f", + "color-204": "#ff5f87", + "color-205": "#ff5faf", + "color-206": "#ff5fdf", + "color-207": "#ff5fff", + "color-208": "#ff8700", + "color-209": "#ff875f", + "color-210": "#ff8787", + "color-211": "#ff87af", + "color-212": "#ff87df", + "color-213": "#ff87ff", + "color-214": "#ffaf00", + "color-215": "#ffaf5f", + "color-216": "#ffaf87", + "color-217": "#ffafaf", + "color-218": "#ffafdf", + "color-219": "#ffafff", + "color-220": "#ffdf00", + "color-221": "#ffdf5f", + "color-222": "#ffdf87", + "color-223": "#ffdfaf", + "color-224": "#ffdfdf", + "color-225": "#ffdfff", + "color-226": "#ffff00", + "color-227": "#ffff5f", + "color-228": "#ffff87", + "color-229": "#ffffaf", + "color-230": "#ffffdf", + "color-231": "#ffffff", + "color-232": "#080808", + "color-233": "#121212", + "color-234": "#1c1c1c", + "color-235": "#262626", + "color-236": "#303030", + "color-237": "#3a3a3a", + "color-238": "#444444", + "color-239": "#4e4e4e", + "color-240": "#585858", + "color-241": "#606060", + "color-242": "#666666", + "color-243": "#767676", + "color-244": "#808080", + "color-245": "#8a8a8a", + "color-246": "#949494", + "color-247": "#9e9e9e", + "color-248": "#a8a8a8", + "color-249": "#b2b2b2", + "color-250": "#bcbcbc", + "color-251": "#c6c6c6", + "color-252": "#d0d0d0", + "color-253": "#dadada", + "color-254": "#e4e4e4", + "color-255": "#eeeeee", + "bgcolor-000": "#000000", + "bgcolor-001": "#800000", + "bgcolor-002": "#008000", + "bgcolor-003": "#808000", + "bgcolor-004": "#000080", + "bgcolor-005": "#800080", + "bgcolor-006": "#008080", + "bgcolor-007": "#c0c0c0", + "bgcolor-008": "#808080", + "bgcolor-009": "#ff0000", + "bgcolor-010": "#00ff00", + "bgcolor-011": "#ffff00", + "bgcolor-012": "#0000ff", + "bgcolor-013": "#ff00ff", + "bgcolor-014": "#00ffff", + "bgcolor-015": "#ffffff", + "bgcolor-016": "#000000", + "bgcolor-017": "#00005f", + "bgcolor-018": "#000087", + "bgcolor-019": "#0000af", + "bgcolor-020": "#0000df", + "bgcolor-021": "#0000ff", + "bgcolor-022": "#005f00", + "bgcolor-023": "#005f5f", + "bgcolor-024": "#005f87", + "bgcolor-025": "#005faf", + "bgcolor-026": "#005fdf", + "bgcolor-027": "#005fff", + "bgcolor-028": "#008700", + "bgcolor-029": "#00875f", + "bgcolor-030": "#008787", + "bgcolor-031": "#0087af", + "bgcolor-032": "#0087df", + "bgcolor-033": "#0087ff", + "bgcolor-034": "#00af00", + "bgcolor-035": "#00af5f", + "bgcolor-036": "#00af87", + "bgcolor-037": "#00afaf", + "bgcolor-038": "#00afdf", + "bgcolor-039": "#00afff", + "bgcolor-040": "#00df00", + "bgcolor-041": "#00df5f", + "bgcolor-042": "#00df87", + "bgcolor-043": "#00dfaf", + "bgcolor-044": "#00dfdf", + "bgcolor-045": "#00dfff", + "bgcolor-046": "#00ff00", + "bgcolor-047": "#00ff5f", + "bgcolor-048": "#00ff87", + "bgcolor-049": "#00ffaf", + "bgcolor-050": "#00ffdf", + "bgcolor-051": "#00ffff", + "bgcolor-052": "#5f0000", + "bgcolor-053": "#5f005f", + "bgcolor-054": "#5f0087", + "bgcolor-055": "#5f00af", + "bgcolor-056": "#5f00df", + "bgcolor-057": "#5f00ff", + "bgcolor-058": "#5f5f00", + "bgcolor-059": "#5f5f5f", + "bgcolor-060": "#5f5f87", + "bgcolor-061": "#5f5faf", + "bgcolor-062": "#5f5fdf", + "bgcolor-063": "#5f5fff", + "bgcolor-064": "#5f8700", + "bgcolor-065": "#5f875f", + "bgcolor-066": "#5f8787", + "bgcolor-067": "#5f87af", + "bgcolor-068": "#5f87df", + "bgcolor-069": "#5f87ff", + "bgcolor-070": "#5faf00", + "bgcolor-071": "#5faf5f", + "bgcolor-072": "#5faf87", + "bgcolor-073": "#5fafaf", + "bgcolor-074": "#5fafdf", + "bgcolor-075": "#5fafff", + "bgcolor-076": "#5fdf00", + "bgcolor-077": "#5fdf5f", + "bgcolor-078": "#5fdf87", + "bgcolor-079": "#5fdfaf", + "bgcolor-080": "#5fdfdf", + "bgcolor-081": "#5fdfff", + "bgcolor-082": "#5fff00", + "bgcolor-083": "#5fff5f", + "bgcolor-084": "#5fff87", + "bgcolor-085": "#5fffaf", + "bgcolor-086": "#5fffdf", + "bgcolor-087": "#5fffff", + "bgcolor-088": "#870000", + "bgcolor-089": "#87005f", + "bgcolor-090": "#870087", + "bgcolor-091": "#8700af", + "bgcolor-092": "#8700df", + "bgcolor-093": "#8700ff", + "bgcolor-094": "#875f00", + "bgcolor-095": "#875f5f", + "bgcolor-096": "#875f87", + "bgcolor-097": "#875faf", + "bgcolor-098": "#875fdf", + "bgcolor-099": "#875fff", + "bgcolor-100": "#878700", + "bgcolor-101": "#87875f", + "bgcolor-102": "#878787", + "bgcolor-103": "#8787af", + "bgcolor-104": "#8787df", + "bgcolor-105": "#8787ff", + "bgcolor-106": "#87af00", + "bgcolor-107": "#87af5f", + "bgcolor-108": "#87af87", + "bgcolor-109": "#87afaf", + "bgcolor-110": "#87afdf", + "bgcolor-111": "#87afff", + "bgcolor-112": "#87df00", + "bgcolor-113": "#87df5f", + "bgcolor-114": "#87df87", + "bgcolor-115": "#87dfaf", + "bgcolor-116": "#87dfdf", + "bgcolor-117": "#87dfff", + "bgcolor-118": "#87ff00", + "bgcolor-119": "#87ff5f", + "bgcolor-120": "#87ff87", + "bgcolor-121": "#87ffaf", + "bgcolor-122": "#87ffdf", + "bgcolor-123": "#87ffff", + "bgcolor-124": "#af0000", + "bgcolor-125": "#af005f", + "bgcolor-126": "#af0087", + "bgcolor-127": "#af00af", + "bgcolor-128": "#af00df", + "bgcolor-129": "#af00ff", + "bgcolor-130": "#af5f00", + "bgcolor-131": "#af5f5f", + "bgcolor-132": "#af5f87", + "bgcolor-133": "#af5faf", + "bgcolor-134": "#af5fdf", + "bgcolor-135": "#af5fff", + "bgcolor-136": "#af8700", + "bgcolor-137": "#af875f", + "bgcolor-138": "#af8787", + "bgcolor-139": "#af87af", + "bgcolor-140": "#af87df", + "bgcolor-141": "#af87ff", + "bgcolor-142": "#afaf00", + "bgcolor-143": "#afaf5f", + "bgcolor-144": "#afaf87", + "bgcolor-145": "#afafaf", + "bgcolor-146": "#afafdf", + "bgcolor-147": "#afafff", + "bgcolor-148": "#afdf00", + "bgcolor-149": "#afdf5f", + "bgcolor-150": "#afdf87", + "bgcolor-151": "#afdfaf", + "bgcolor-152": "#afdfdf", + "bgcolor-153": "#afdfff", + "bgcolor-154": "#afff00", + "bgcolor-155": "#afff5f", + "bgcolor-156": "#afff87", + "bgcolor-157": "#afffaf", + "bgcolor-158": "#afffdf", + "bgcolor-159": "#afffff", + "bgcolor-160": "#df0000", + "bgcolor-161": "#df005f", + "bgcolor-162": "#df0087", + "bgcolor-163": "#df00af", + "bgcolor-164": "#df00df", + "bgcolor-165": "#df00ff", + "bgcolor-166": "#df5f00", + "bgcolor-167": "#df5f5f", + "bgcolor-168": "#df5f87", + "bgcolor-169": "#df5faf", + "bgcolor-170": "#df5fdf", + "bgcolor-171": "#df5fff", + "bgcolor-172": "#df8700", + "bgcolor-173": "#df875f", + "bgcolor-174": "#df8787", + "bgcolor-175": "#df87af", + "bgcolor-176": "#df87df", + "bgcolor-177": "#df87ff", + "bgcolor-178": "#dfaf00", + "bgcolor-179": "#dfaf5f", + "bgcolor-180": "#dfaf87", + "bgcolor-181": "#dfafaf", + "bgcolor-182": "#dfafdf", + "bgcolor-183": "#dfafff", + "bgcolor-184": "#dfdf00", + "bgcolor-185": "#dfdf5f", + "bgcolor-186": "#dfdf87", + "bgcolor-187": "#dfdfaf", + "bgcolor-188": "#dfdfdf", + "bgcolor-189": "#dfdfff", + "bgcolor-190": "#dfff00", + "bgcolor-191": "#dfff5f", + "bgcolor-192": "#dfff87", + "bgcolor-193": "#dfffaf", + "bgcolor-194": "#dfffdf", + "bgcolor-195": "#dfffff", + "bgcolor-196": "#ff0000", + "bgcolor-197": "#ff005f", + "bgcolor-198": "#ff0087", + "bgcolor-199": "#ff00af", + "bgcolor-200": "#ff00df", + "bgcolor-201": "#ff00ff", + "bgcolor-202": "#ff5f00", + "bgcolor-203": "#ff5f5f", + "bgcolor-204": "#ff5f87", + "bgcolor-205": "#ff5faf", + "bgcolor-206": "#ff5fdf", + "bgcolor-207": "#ff5fff", + "bgcolor-208": "#ff8700", + "bgcolor-209": "#ff875f", + "bgcolor-210": "#ff8787", + "bgcolor-211": "#ff87af", + "bgcolor-212": "#ff87df", + "bgcolor-213": "#ff87ff", + "bgcolor-214": "#ffaf00", + "bgcolor-215": "#ffaf5f", + "bgcolor-216": "#ffaf87", + "bgcolor-217": "#ffafaf", + "bgcolor-218": "#ffafdf", + "bgcolor-219": "#ffafff", + "bgcolor-220": "#ffdf00", + "bgcolor-221": "#ffdf5f", + "bgcolor-222": "#ffdf87", + "bgcolor-223": "#ffdfaf", + "bgcolor-224": "#ffdfdf", + "bgcolor-225": "#ffdfff", + "bgcolor-226": "#ffff00", + "bgcolor-227": "#ffff5f", + "bgcolor-228": "#ffff87", + "bgcolor-229": "#ffffaf", + "bgcolor-230": "#ffffdf", + "bgcolor-231": "#ffffff", + "bgcolor-232": "#080808", + "bgcolor-233": "#121212", + "bgcolor-234": "#1c1c1c", + "bgcolor-235": "#262626", + "bgcolor-236": "#303030", + "bgcolor-237": "#3a3a3a", + "bgcolor-238": "#444444", + "bgcolor-239": "#4e4e4e", + "bgcolor-240": "#585858", + "bgcolor-241": "#606060", + "bgcolor-242": "#666666", + "bgcolor-243": "#767676", + "bgcolor-244": "#808080", + "bgcolor-245": "#8a8a8a", + "bgcolor-246": "#949494", + "bgcolor-247": "#9e9e9e", + "bgcolor-248": "#a8a8a8", + "bgcolor-249": "#b2b2b2", + "bgcolor-250": "#bcbcbc", + "bgcolor-251": "#c6c6c6", + "bgcolor-252": "#d0d0d0", + "bgcolor-253": "#dadada", + "bgcolor-254": "#e4e4e4", + "bgcolor-255": "#eeeeee", } @@ -176,7 +538,7 @@ class RootTag: The Root tag class made to contain other tags. """ - __slots__ = ('child',) + __slots__ = ("child",) def __init__(self): self.child = None @@ -207,7 +569,7 @@ class TextTag(ChildTag): Output: SomeText """ - __slots__ = ('parent', 'child', 'text') + __slots__ = ("parent", "child", "text") def __init__(self, parent, text): super().__init__(parent) @@ -223,9 +585,12 @@ class BBCodeTag(ChildTag): Base BBCodeTag node to encapsulate and be encapsulated. """ - __slots__ = ('parent', 'child',) + __slots__ = ( + "parent", + "child", + ) - code = '' + code = "" def __init__(self, parent): super().__init__(parent) @@ -241,7 +606,7 @@ class UnderlineTag(BBCodeTag): Output: [u]Underlined Text[/u] """ - code = 'u' + code = "u" class BlinkTag(BBCodeTag): @@ -250,7 +615,7 @@ class BlinkTag(BBCodeTag): Output: [blink]Blinking Text[/blink] """ - code = 'blink' + code = "blink" class ColorTag(BBCodeTag): @@ -259,9 +624,13 @@ class ColorTag(BBCodeTag): Output: [fgcolor=#000000]Colorized Text[/fgcolor] """ - __slots__ = ('parent', 'child', 'color_hex',) + __slots__ = ( + "parent", + "child", + "color_hex", + ) - code = 'color' + code = "color" def __init__(self, parent, color_hex): super().__init__(parent) @@ -277,7 +646,7 @@ class BGColorTag(ColorTag): Output: [bgcolor=#000000]Colorized Text[/bgcolor] """ - code = 'bgcolor' + code = "bgcolor" class UrlTag(BBCodeTag): @@ -287,11 +656,15 @@ class UrlTag(BBCodeTag): """ - __slots__ = ('parent', 'child', 'url_data',) + __slots__ = ( + "parent", + "child", + "url_data", + ) - code = 'url' + code = "url" - def __init__(self, parent, url_data=''): + def __init__(self, parent, url_data=""): super().__init__(parent) self.url_data = url_data @@ -316,7 +689,7 @@ class TextToBBCODEparser(TextToHTMLparser): text (str): Processed text """ # Converts to bbcode styled urls - return self.re_url.sub(r'[url=\1]\1[/url]\2', text) + return self.re_url.sub(r"[url=\1]\1[/url]\2", text) def sub_mxp_links(self, match): """ @@ -442,10 +815,7 @@ class TextToBBCODEparser(TextToHTMLparser): inverse = True # blink codes - if ( - substr in (ANSI_BLINK, ANSI_BLINK_HILITE, ANSI_INV_BLINK_HILITE) - and not blink - ): + if substr in (ANSI_BLINK, ANSI_BLINK_HILITE, ANSI_INV_BLINK_HILITE) and not blink: blink = True current_tag = BlinkTag(current_tag) diff --git a/evennia/contrib/base_systems/godotwebsocket/webclient.py b/evennia/contrib/base_systems/godotwebsocket/webclient.py index ceb3ee4679..9154d1c653 100644 --- a/evennia/contrib/base_systems/godotwebsocket/webclient.py +++ b/evennia/contrib/base_systems/godotwebsocket/webclient.py @@ -22,6 +22,7 @@ class GodotWebSocketClient(webclient.WebSocketClient): It inherits from the basic Websocket implementation and changes only what is necessary. """ + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.protocol_key = "godotclient/websocket" diff --git a/evennia/game_template/__init__.py b/evennia/game_template/__init__.py deleted file mode 100644 index 6e3dbee766..0000000000 --- a/evennia/game_template/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -""" -This sub-package holds the template for creating a new game folder. -The new game folder (when running evennia --init) is a copy of this -folder. - -""" diff --git a/evennia/server/portal/discord.py b/evennia/server/portal/discord.py index 0e0f2b2bee..d1cb6c34c7 100644 --- a/evennia/server/portal/discord.py +++ b/evennia/server/portal/discord.py @@ -27,7 +27,6 @@ from evennia.server.session import Session from evennia.utils import class_from_module, get_evennia_version, logger from evennia.utils.utils import delay - _BASE_SESSION_CLASS = class_from_module(settings.BASE_SESSION_CLASS) DISCORD_API_VERSION = 10 diff --git a/evennia/typeclasses/models.py b/evennia/typeclasses/models.py index 045c994d25..8d1c76e7eb 100644 --- a/evennia/typeclasses/models.py +++ b/evennia/typeclasses/models.py @@ -216,8 +216,10 @@ class TypedObject(SharedMemoryModel): "typeclass", max_length=255, null=True, - help_text="this defines what 'type' of entity this is. This variable holds " - "a Python path to a module with a valid Evennia Typeclass.", + help_text=( + "this defines what 'type' of entity this is. This variable holds " + "a Python path to a module with a valid Evennia Typeclass." + ), db_index=True, ) # Creation date. This is not changed once the object is created. @@ -226,20 +228,26 @@ class TypedObject(SharedMemoryModel): db_lock_storage = models.TextField( "locks", blank=True, - help_text="locks limit access to an entity. A lock is defined as a 'lock string' " - "on the form 'type:lockfunctions', defining what functionality is locked and " - "how to determine access. Not defining a lock means no access is granted.", + help_text=( + "locks limit access to an entity. A lock is defined as a 'lock string' " + "on the form 'type:lockfunctions', defining what functionality is locked and " + "how to determine access. Not defining a lock means no access is granted." + ), ) # many2many relationships db_attributes = models.ManyToManyField( Attribute, - help_text="attributes on this object. An attribute can hold any pickle-able " - "python object (see docs for special cases).", + help_text=( + "attributes on this object. An attribute can hold any pickle-able " + "python object (see docs for special cases)." + ), ) db_tags = models.ManyToManyField( Tag, - help_text="tags on this object. Tags are simple string markers to identify, " - "group and alias objects.", + help_text=( + "tags on this object. Tags are simple string markers to identify, " + "group and alias objects." + ), ) # Database manager @@ -290,8 +298,8 @@ class TypedObject(SharedMemoryModel): self.__dbclass__ = class_from_module("evennia.objects.models.ObjectDB") self.db_typeclass_path = "evennia.objects.objects.DefaultObject" log_trace( - "Critical: Class %s of %s is not a valid typeclass!\nTemporarily falling back to %s." - % (err_class, self, self.__class__) + "Critical: Class %s of %s is not a valid typeclass!\nTemporarily falling back" + " to %s." % (err_class, self, self.__class__) ) def __init__(self, *args, **kwargs): diff --git a/evennia/utils/tests/test_search.py b/evennia/utils/tests/test_search.py index b529f4100a..b6c5ba6865 100644 --- a/evennia/utils/tests/test_search.py +++ b/evennia/utils/tests/test_search.py @@ -81,7 +81,7 @@ class TestSearch(EvenniaTest): DefaultObject.create("test_obj_2") with self.assertRaises(ImportError): search_typeclass("not.a.typeclass") - + def test_search_object_attribute(self): """Check that an object can be found by its attributes.""" object, errors = DefaultObject.create("an-object")