From a7422d11c092852fc5f5263192e158e0d59f7400 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 6 Jan 2022 20:24:22 +0000 Subject: [PATCH] whitespace changes --- mmgen/daemon.py | 9 ++++++--- mmgen/filename.py | 3 ++- mmgen/rpc.py | 2 ++ mmgen/util.py | 2 ++ test/test.py | 6 ++++-- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mmgen/daemon.py b/mmgen/daemon.py index 63061183..c221f63d 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -212,9 +212,12 @@ class Daemon(Lockable): def test_socket(self,host,port,timeout=10): import socket - try: socket.create_connection((host,port),timeout=timeout).close() - except: return False - else: return True + try: + socket.create_connection((host,port),timeout=timeout).close() + except: + return False + else: + return True def wait_for_state(self,req_state): for i in range(300): diff --git a/mmgen/filename.py b/mmgen/filename.py index 3270c2ee..38365aed 100755 --- a/mmgen/filename.py +++ b/mmgen/filename.py @@ -64,7 +64,8 @@ class Filename(MMGenObject): import stat if stat.S_ISBLK(st.st_mode): mode = (os.O_RDONLY,os.O_RDWR)[bool(write)] - if g.platform == 'win': mode |= os.O_BINARY + if g.platform == 'win': + mode |= os.O_BINARY try: fd = os.open(fn, mode) except OSError as e: diff --git a/mmgen/rpc.py b/mmgen/rpc.py index 4c14c3a1..0a470a6d 100755 --- a/mmgen/rpc.py +++ b/mmgen/rpc.py @@ -140,11 +140,13 @@ class RPCBackends: async def run(self,payload,timeout,wallet): dmsg_rpc('\n RPC PAYLOAD data (httplib) ==>\n{}\n',payload) + if timeout: import http.client s = http.client.HTTPConnection(self.host,self.port,timeout) else: s = self.session + try: s.request( method = 'POST', diff --git a/mmgen/util.py b/mmgen/util.py index a04bba49..40f76afc 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -674,6 +674,7 @@ def get_words_from_user(prompt): return words def get_words_from_file(infile,desc,quiet=False): + if not quiet: qmsg(f'Getting {desc} from file {infile!r}') @@ -686,6 +687,7 @@ def get_words_from_file(infile,desc,quiet=False): die(1,f'{capfirst(desc)} data must be UTF-8 encoded.') dmsg('Sanitized input: [{}]'.format(' '.join(words))) + return words def get_words(infile,desc,prompt): diff --git a/test/test.py b/test/test.py index 07cd9e2e..8259c832 100755 --- a/test/test.py +++ b/test/test.py @@ -881,10 +881,12 @@ class TestSuiteRunner(object): if build: if rerun: for fn in fns: - if not root: os.unlink(fn) + if not root: + os.unlink(fn) if not (dpy and opt.skip_deps): self.run_test(cmd) - if not root: do_between() + if not root: + do_between() else: # If prog produces multiple files: if cmd not in self.rebuild_list or rerun == True: