From a3c34f5f39149b90302a06a5de2b7d0aaebc9fb9 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 19 Sep 2020 14:02:03 +0200 Subject: [PATCH] Run black on sources --- .github/workflows/mysql_settings.py | 2 +- evennia/commands/default/building.py | 1 + evennia/commands/default/comms.py | 1 - evennia/commands/default/system.py | 4 +- evennia/commands/default/tests.py | 1 - evennia/contrib/tests.py | 2 +- .../tutorial_examples/example_batch_code.py | 6 +-- evennia/prototypes/prototypes.py | 46 ++++++++----------- evennia/prototypes/tests.py | 15 +++--- evennia/scripts/tickerhandler.py | 6 ++- evennia/server/connection_wizard.py | 14 +++--- evennia/server/evennia_launcher.py | 7 ++- evennia/server/portal/telnet.py | 1 + evennia/server/portal/webclient.py | 1 + evennia/utils/evmore.py | 3 +- evennia/utils/utils.py | 8 ++-- 16 files changed, 58 insertions(+), 60 deletions(-) diff --git a/.github/workflows/mysql_settings.py b/.github/workflows/mysql_settings.py index a3465b3cc6..b5525dcd74 100644 --- a/.github/workflows/mysql_settings.py +++ b/.github/workflows/mysql_settings.py @@ -54,7 +54,7 @@ DATABASES = { "NAME": "evennia", "OPTIONS": { "charset": "utf8mb4", - 'init_command': 'set collation_connection=utf8mb4_unicode_ci' + "init_command": "set collation_connection=utf8mb4_unicode_ci", }, }, } diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py index 8006130336..e79b0d3cce 100644 --- a/evennia/commands/default/building.py +++ b/evennia/commands/default/building.py @@ -3077,6 +3077,7 @@ class CmdScript(COMMAND_DEFAULT_CLASS): elif not self.switches: # view all scripts from evennia.commands.default.system import ScriptEvMore + ScriptEvMore(self.caller, scripts.order_by("id"), session=self.session) return elif "start" in self.switches: diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py index 55e96ecd4e..ed7ff7ba73 100644 --- a/evennia/commands/default/comms.py +++ b/evennia/commands/default/comms.py @@ -40,7 +40,6 @@ __all__ = ( "CmdIRCStatus", "CmdRSS2Chan", "CmdGrapevine2Chan", - ) _DEFAULT_WIDTH = settings.CLIENT_DEFAULT_WIDTH diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py index d323cb24e1..6ba160e489 100644 --- a/evennia/commands/default/system.py +++ b/evennia/commands/default/system.py @@ -439,7 +439,7 @@ class ScriptEvMore(EvMore): "|wdesc|n", align="r", border="tablecols", - width=self.width + width=self.width, ) for script in scripts: @@ -570,7 +570,7 @@ class CmdScripts(COMMAND_DEFAULT_CLASS): caller.msg(string) else: # No stopping or validation. We just want to view things. - ScriptEvMore(caller, scripts.order_by('id'), session=self.session) + ScriptEvMore(caller, scripts.order_by("id"), session=self.session) class CmdObjects(COMMAND_DEFAULT_CLASS): diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py index 739f5f9a34..8227de27bf 100644 --- a/evennia/commands/default/tests.py +++ b/evennia/commands/default/tests.py @@ -1239,7 +1239,6 @@ class TestBuilding(CommandTest): ) def test_spawn(self): - def get_object(commandTest, obj_key): # A helper function to get a spawned object and # check that it exists in the process. diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py index d0eda87ea2..a4e50a29f7 100644 --- a/evennia/contrib/tests.py +++ b/evennia/contrib/tests.py @@ -895,7 +895,7 @@ class TestDice(CommandTest): # Test email-login -from evennia.contrib import email_login # noqa +from evennia.contrib import email_login # noqa class TestEmailLogin(CommandTest): diff --git a/evennia/contrib/tutorial_examples/example_batch_code.py b/evennia/contrib/tutorial_examples/example_batch_code.py index 7aeca3f3a0..edb2483468 100644 --- a/evennia/contrib/tutorial_examples/example_batch_code.py +++ b/evennia/contrib/tutorial_examples/example_batch_code.py @@ -39,7 +39,7 @@ # -#HEADER +# HEADER # everything in this block will be appended to the beginning of # all other #CODE blocks when they are executed. @@ -51,7 +51,7 @@ from evennia import DefaultObject limbo = search_object("Limbo")[0] -#CODE +# CODE # This is the first code block. Within each block, Python # code works as normal. Note how we make use if imports and @@ -67,7 +67,7 @@ red_button = create_object( # we take a look at what we created caller.msg("A %s was created." % red_button.key) -#CODE +# CODE # this code block has 'table' and 'chair' set as deletable # objects. This means that when the batchcode processor runs in diff --git a/evennia/prototypes/prototypes.py b/evennia/prototypes/prototypes.py index 75410f20d3..cd5fde5739 100644 --- a/evennia/prototypes/prototypes.py +++ b/evennia/prototypes/prototypes.py @@ -167,8 +167,9 @@ for mod in settings.PROTOTYPE_MODULES: if "prototype_locks" in prot else "use:all();edit:false()" ), - "prototype_tags": list(set(list( - make_iter(prot.get("prototype_tags", []))) + ["module"])), + "prototype_tags": list( + set(list(make_iter(prot.get("prototype_tags", []))) + ["module"]) + ), } ) _MODULE_PROTOTYPES[actual_prot_key] = prot @@ -392,35 +393,23 @@ def search_prototype(key=None, tags=None, require_single=False, return_iterators # exact match on tag(s) tags = make_iter(tags) tag_categories = ["db_prototype" for _ in tags] - db_matches = DbPrototype.objects.get_by_tag( - tags, tag_categories) + db_matches = DbPrototype.objects.get_by_tag(tags, tag_categories) else: db_matches = DbPrototype.objects.all() if key: # exact or partial match on key - exact_match = ( - db_matches - .filter( - Q(db_key__iexact=key)) - .order_by("db_key") - ) + exact_match = db_matches.filter(Q(db_key__iexact=key)).order_by("db_key") if not exact_match: # try with partial match instead - db_matches = ( - db_matches - .filter( - Q(db_key__icontains=key)) - .order_by("db_key") - ) + db_matches = db_matches.filter(Q(db_key__icontains=key)).order_by("db_key") else: db_matches = exact_match # convert to prototype db_ids = db_matches.values_list("id", flat=True) db_matches = ( - Attribute.objects - .filter(scriptdb__pk__in=db_ids, db_key="prototype") + Attribute.objects.filter(scriptdb__pk__in=db_ids, db_key="prototype") .values_list("db_value", flat=True) .order_by("scriptdb__db_key") ) @@ -501,7 +490,7 @@ class PrototypeEvMore(EvMore): else: # get the correct slice, adjusted for the db-prototypes pageno = max(0, pageno - self._npages_db) - return modprot_list[pageno * self.height: pageno * self.height + self.height] + return modprot_list[pageno * self.height : pageno * self.height + self.height] def page_formatter(self, page): """Input is a queryset page from django.Paginator""" @@ -517,7 +506,7 @@ class PrototypeEvMore(EvMore): "|wDesc|n", border="tablecols", crop=True, - width=self.width + width=self.width, ) for prototype in page: @@ -554,8 +543,9 @@ class PrototypeEvMore(EvMore): return str(table) -def list_prototypes(caller, key=None, tags=None, show_non_use=False, - show_non_edit=True, session=None): +def list_prototypes( + caller, key=None, tags=None, show_non_use=False, show_non_edit=True, session=None +): """ Collate a list of found prototypes based on search criteria and access. @@ -581,10 +571,14 @@ def list_prototypes(caller, key=None, tags=None, show_non_use=False, return None # get specific prototype (one value or exception) - return PrototypeEvMore(caller, (dbprot_query, modprot_list), - session=session, - show_non_use=show_non_use, - show_non_edit=show_non_edit) + return PrototypeEvMore( + caller, + (dbprot_query, modprot_list), + session=session, + show_non_use=show_non_use, + show_non_edit=show_non_edit, + ) + def validate_prototype( prototype, protkey=None, protparents=None, is_prototype_base=True, strict=True, _flags=None diff --git a/evennia/prototypes/tests.py b/evennia/prototypes/tests.py index 755d7f2e13..f7eac5d912 100644 --- a/evennia/prototypes/tests.py +++ b/evennia/prototypes/tests.py @@ -630,10 +630,8 @@ class TestPrototypeStorage(EvenniaTest): # partial match with mock.patch("evennia.prototypes.prototypes._MODULE_PROTOTYPES", {}): - self.assertCountEqual( - protlib.search_prototype("prot"), [prot1b, prot2, prot3]) - self.assertCountEqual( - protlib.search_prototype(tags="foo1"), [prot1b, prot2, prot3]) + self.assertCountEqual(protlib.search_prototype("prot"), [prot1b, prot2, prot3]) + self.assertCountEqual(protlib.search_prototype(tags="foo1"), [prot1b, prot2, prot3]) self.assertTrue(str(str(protlib.list_prototypes(self.char1)))) @@ -1078,6 +1076,7 @@ class TestOLCMenu(TestEvMenu): ], ] + class PrototypeCrashTest(EvenniaTest): # increase this to 1000 for optimization testing @@ -1089,9 +1088,9 @@ class PrototypeCrashTest(EvenniaTest): # print(f"Creating {num} additional prototypes...") for x in range(num): prot = { - 'prototype_key': str(uuid.uuid4()), - 'some_attributes': [str(uuid.uuid4()) for x in range(10)], - 'prototype_tags': list(sample(['demo', 'test', 'stuff'], 2)), + "prototype_key": str(uuid.uuid4()), + "some_attributes": [str(uuid.uuid4()) for x in range(10)], + "prototype_tags": list(sample(["demo", "test", "stuff"], 2)), } protlib.save_prototype(prot) @@ -1101,5 +1100,5 @@ class PrototypeCrashTest(EvenniaTest): self.create(num_prototypes) # print("Attempting to list prototypes...") # start_time = time() - self.char1.execute_cmd('spawn/list') + self.char1.execute_cmd("spawn/list") # print(f"Prototypes listed in {time()-start_time} seconds.") diff --git a/evennia/scripts/tickerhandler.py b/evennia/scripts/tickerhandler.py index 47dc9f02b3..239d8a2509 100644 --- a/evennia/scripts/tickerhandler.py +++ b/evennia/scripts/tickerhandler.py @@ -344,8 +344,10 @@ class TickerHandler(object): raise TypeError(f"{callback} is not a callable function or method.") if outobj and not inherits_from(outobj, "evennia.typeclasses.models.TypedObject"): - raise TypeError(f"{callback} is a method on a normal object - it must " - "be either a method on a typeclass, or a stand-alone function.") + raise TypeError( + f"{callback} is a method on a normal object - it must " + "be either a method on a typeclass, or a stand-alone function." + ) return outobj, outpath, outcallfunc diff --git a/evennia/server/connection_wizard.py b/evennia/server/connection_wizard.py index cce74fb703..38c658f95f 100644 --- a/evennia/server/connection_wizard.py +++ b/evennia/server/connection_wizard.py @@ -176,17 +176,14 @@ def node_start(wizard): node_game_index_start, {}, ), - "2": ("MSSP setup (for mud-list crawlers)", - node_mssp_start, {} - ), + "2": ("MSSP setup (for mud-list crawlers)", node_mssp_start, {}), # "3": ("Add Grapevine listing", # node_grapevine_start, {}), # "4": ("Add IRC link", # "node_irc_start", {}), # "5" ("Add RSS feed", # "node_rss_start", {}), - "s": ("View and (optionally) Save created settings", - node_view_and_apply_settings, {}), + "s": ("View and (optionally) Save created settings", node_view_and_apply_settings, {}), "q": ("Quit", lambda *args: sys.exit(), {}), } @@ -263,7 +260,7 @@ def node_game_index_fields(wizard, status=None): return True wizard.display(text) - wizard.game_index_listing['game_name'] = wizard.ask_input( + wizard.game_index_listing["game_name"] = wizard.ask_input( default=name_default, validator=name_validator ) @@ -494,8 +491,9 @@ def node_view_and_apply_settings(wizard): # game index game_index_save_text = "" - game_index_listing = (wizard.game_index_listing if - hasattr(wizard, "game_index_listing") else None) + game_index_listing = ( + wizard.game_index_listing if hasattr(wizard, "game_index_listing") else None + ) if not game_index_listing and settings.GAME_INDEX_ENABLED: game_index_listing = settings.GAME_INDEX_LISTING if game_index_listing: diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 69517fa38e..e4467f0800 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -1278,8 +1278,11 @@ def check_main_evennia_dependencies(): # only the main version (1.5, not 1.5.4.0) dversion_main = ".".join(dversion.split(".")[:2]) if LooseVersion(dversion) < LooseVersion(DJANGO_MIN): - print(ERROR_DJANGO_MIN.format(dversion=dversion_main, django_min=DJANGO_MIN, - django_lt=DJANGO_LT)) + print( + ERROR_DJANGO_MIN.format( + dversion=dversion_main, django_min=DJANGO_MIN, django_lt=DJANGO_LT + ) + ) error = True elif LooseVersion(DJANGO_LT) <= LooseVersion(dversion_main): print(NOTE_DJANGO_NEW.format(dversion=dversion_main, django_rec=DJANGO_LT)) diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py index 8f43cacd2a..494b8569c1 100644 --- a/evennia/server/portal/telnet.py +++ b/evennia/server/portal/telnet.py @@ -85,6 +85,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): super().dataReceived(data) except ValueError as err: from evennia.utils import logger + logger.log_err(f"Malformed telnet input: {err}") def connectionMade(self): diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py index 155599c7a0..b00a36d6d9 100644 --- a/evennia/server/portal/webclient.py +++ b/evennia/server/portal/webclient.py @@ -42,6 +42,7 @@ GOING_AWAY = WebSocketServerProtocol.CLOSE_STATUS_CODE_GOING_AWAY STATE_CLOSING = WebSocketServerProtocol.STATE_CLOSING + class WebSocketClient(WebSocketServerProtocol, Session): """ Implements the server-side of the Websocket connection. diff --git a/evennia/utils/evmore.py b/evennia/utils/evmore.py index f992446979..702b523d60 100644 --- a/evennia/utils/evmore.py +++ b/evennia/utils/evmore.py @@ -331,7 +331,6 @@ class EvMore(object): # goto top of the text self.page_top() - # default paginators - responsible for extracting a specific page number def paginator_index(self, pageno): @@ -343,7 +342,7 @@ class EvMore(object): Paginate by slice. This is done with an eye on memory efficiency (usually for querysets); to avoid fetching all objects at the same time. """ - return self._data[pageno * self.height: pageno * self.height + self.height] + return self._data[pageno * self.height : pageno * self.height + self.height] def paginator_django(self, pageno): """ diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index bd5d460b5b..541d516b9f 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -1918,9 +1918,11 @@ def at_search_result(matches, caller, query="", quiet=False, **kwargs): # we need to consider Commands, where .aliases is a list aliases = result.aliases.all() if hasattr(result.aliases, "all") else result.aliases # remove any pluralization aliases - aliases = [alias for alias in aliases if - hasattr(alias, "category") - and alias.category not in ("plural_key", )] + aliases = [ + alias + for alias in aliases + if hasattr(alias, "category") and alias.category not in ("plural_key",) + ] error += _MULTIMATCH_TEMPLATE.format( number=num + 1, name=result.get_display_name(caller)