From 69f8d7d2fec8d1c79119fd51d2ede06adb387331 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 19 Jan 2022 11:43:50 +0000 Subject: [PATCH] whitespace, cleanups (minor) --- mmgen/keygen.py | 2 +- mmgen/obj.py | 5 +++-- mmgen/tool.py | 8 -------- mmgen/util.py | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/mmgen/keygen.py b/mmgen/keygen.py index 19b560c9..2250dfab 100755 --- a/mmgen/keygen.py +++ b/mmgen/keygen.py @@ -100,7 +100,7 @@ class keygen_backend: compressed = privkey.compressed ) class monero: - backends = ('nacl','ed25519ll_djbec','ed25519') + backends = ('nacl','ed25519ll-djbec','ed25519') class base(keygen_base): diff --git a/mmgen/obj.py b/mmgen/obj.py index 69f1710a..cf6280d6 100755 --- a/mmgen/obj.py +++ b/mmgen/obj.py @@ -338,9 +338,10 @@ class MMGenLabel(str,Hilite,InitErrors): def __new__(cls,s,msg=None): if type(s) == cls: return s - for k in cls.forbidden,cls.allowed: + for k in ( cls.forbidden, cls.allowed ): assert type(k) == list - for ch in k: assert type(ch) == str and len(ch) == 1 + for ch in k: + assert type(ch) == str and len(ch) == 1 try: s = s.strip() for ch in s: diff --git a/mmgen/tool.py b/mmgen/tool.py index 5eeb667a..4d575647 100755 --- a/mmgen/tool.py +++ b/mmgen/tool.py @@ -248,14 +248,6 @@ class MMGenToolCmdMeta(type): methods = {} def __new__(mcls,name,bases,namespace): methods = {k:v for k,v in namespace.items() if k[0] != '_' and callable(v) and v.__doc__} - if g.test_suite: - if name in mcls.classes: - raise ValueError(f'Class {name!r} already defined!') - for m in methods: - if m in mcls.methods: - raise ValueError(f'Method {m!r} already defined!') - if not getattr(m,'__doc__',None): - raise ValueError(f'Method {m!r} has no doc string!') cls = super().__new__(mcls,name,bases,namespace) if bases and name != 'tool_api': mcls.classes[name] = cls diff --git a/mmgen/util.py b/mmgen/util.py index c5cff1af..8f25e321 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -96,7 +96,7 @@ def ydie(ev=0,s=''): die(ev,yellow(s)) def pp_fmt(d): import pprint - return pprint.PrettyPrinter(indent=4,compact=True).pformat(d) + return pprint.PrettyPrinter(indent=4,compact=False).pformat(d) def pp_msg(d): msg(pp_fmt(d))