From 5c6c983d256505dccd5484c48bdc0e1fa5b47fb1 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 7 Oct 2022 19:48:51 +0000 Subject: [PATCH] filename.py: class rename: Filename -> MMGenFile --- mmgen/filename.py | 14 +++++++------- mmgen/wallet/__init__.py | 4 ++-- mmgen/wallet/incog_hidden.py | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mmgen/filename.py b/mmgen/filename.py index 82e2d711..a0aeff96 100755 --- a/mmgen/filename.py +++ b/mmgen/filename.py @@ -17,7 +17,7 @@ # along with this program. If not, see . """ -filename.py: Filename class and methods for the MMGen suite +filename.py: File and MMGenFile classes and methods for the MMGen suite """ import sys,os @@ -77,7 +77,7 @@ class FileList(list): assert key in ('atime','ctime','mtime'), f'{key!r}: invalid sort key' self.sort( key=lambda a: getattr(a,key), reverse=reverse ) -class Filename(File): +class MMGenFile(File): def __init__(self,fn,base_class=None,subclass=None,proto=None,write=False): """ @@ -86,16 +86,16 @@ class Filename(File): One or the other must be provided, but not both. - The base class signals support for the Filename API by setting its 'filename_api' + The base class signals support for the MMGenFile API by setting its 'filename_api' attribute to True. """ super().__init__(fn,write) - assert (subclass or base_class) and not (subclass and base_class), 'Filename chk1' + assert (subclass or base_class) and not (subclass and base_class), 'MMGenFile chk1' if not getattr(subclass or base_class,'filename_api',False): - die(3,f'Class {(subclass or base_class).__name__!r} does not support the Filename API') + die(3,f'Class {(subclass or base_class).__name__!r} does not support the MMGenFile API') if base_class: subclass = base_class.ext_to_cls( self.ext, proto ) @@ -109,14 +109,14 @@ class MMGenFileList(FileList): def __init__(self,fns,base_class,proto=None,write=False): return list.__init__( self, - [Filename( fn, base_class=base_class, proto=proto, write=write ) for fn in fns] ) + [MMGenFile( fn, base_class=base_class, proto=proto, write=write ) for fn in fns] ) def find_files_in_dir(subclass,fdir,no_dups=False): assert isinstance(subclass,type), f'{subclass}: not a class' if not getattr(subclass,'filename_api',False): - die(3,f'Class {subclass.__name__!r} does not support the Filename API') + die(3,f'Class {subclass.__name__!r} does not support the MMGenFile API') matches = [l for l in os.listdir(fdir) if l.endswith('.'+subclass.ext)] diff --git a/mmgen/wallet/__init__.py b/mmgen/wallet/__init__.py index 8e5203da..dbf62ab8 100755 --- a/mmgen/wallet/__init__.py +++ b/mmgen/wallet/__init__.py @@ -137,8 +137,8 @@ def Wallet( else: fn = ','.join(opt.hidden_incog_input_params.split(',')[:-1]) # permit comma in filename me = _get_me( 'incog_hidden' ) - from ..filename import Filename - me.infile = Filename( fn, subclass=type(me) ) + from ..filename import MMGenFile + me.infile = MMGenFile( fn, subclass=type(me) ) me.op = 'pwchg_old' if passchg else 'old' elif in_fmt: me = _get_me( get_wallet_data(fmt_code=in_fmt).type ) diff --git a/mmgen/wallet/incog_hidden.py b/mmgen/wallet/incog_hidden.py index 668c9fd1..187d5eb3 100755 --- a/mmgen/wallet/incog_hidden.py +++ b/mmgen/wallet/incog_hidden.py @@ -125,8 +125,8 @@ class wallet(wallet): else: die(1,'Exiting at user request') - from ..filename import Filename - f = Filename(fn,subclass=type(self),write=True) + from ..filename import MMGenFile + f = MMGenFile(fn,subclass=type(self),write=True) dmsg('{} data len {}, offset {}'.format( capfirst(self.desc),