From e92f7dae1fdc049ec56d8b92177786b42335bb97 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 16 Apr 2022 17:28:07 -0400 Subject: [PATCH 1/3] Lint error cleanup following #345 --- fire/core.py | 7 ++++--- fire/core_test.py | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/fire/core.py b/fire/core.py index 6fd1bf7a..c554ca3d 100644 --- a/fire/core.py +++ b/fire/core.py @@ -164,7 +164,8 @@ def Fire(component=None, command=None, name=None, serialize=None): raise FireExit(0, component_trace) # The command succeeded normally; print the result. - _PrintResult(component_trace, verbose=component_trace.verbose, serialize=serialize) + _PrintResult( + component_trace, verbose=component_trace.verbose, serialize=serialize) result = component_trace.GetResult() return result @@ -247,11 +248,11 @@ def _PrintResult(component_trace, verbose=False, serialize=None): # and move serialization to its own module. result = component_trace.GetResult() - # Allow users to modify the return value of the component and provide + # Allow users to modify the return value of the component and provide # custom formatting. if serialize: if not callable(serialize): - raise FireError("serialize argument {} must be empty or callable.".format(serialize)) + raise FireError('The argument `serialize` must be empty or callable:', serialize) result = serialize(result) if value_types.HasCustomStr(result): diff --git a/fire/core_test.py b/fire/core_test.py index a0576ee9..e9987da6 100644 --- a/fire/core_test.py +++ b/fire/core_test.py @@ -205,15 +205,16 @@ def serialize(x): return x ident = lambda x: x - + with self.assertOutputMatches(stdout='a, b', stderr=None): - result = core.Fire(ident, command=['[a,b]'], serialize=serialize) + _ = core.Fire(ident, command=['[a,b]'], serialize=serialize) with self.assertOutputMatches(stdout='a=5, b=6', stderr=None): - result = core.Fire(ident, command=['{a:5,b:6}'], serialize=serialize) + _ = core.Fire(ident, command=['{a:5,b:6}'], serialize=serialize) with self.assertOutputMatches(stdout='asdf', stderr=None): - result = core.Fire(ident, command=['asdf'], serialize=serialize) - with self.assertOutputMatches(stdout="SURPRISE!!\nI'm a list!\n", stderr=None): - result = core.Fire(ident, command=['special'], serialize=serialize) + _ = core.Fire(ident, command=['asdf'], serialize=serialize) + with self.assertOutputMatches( + stdout="SURPRISE!!\nI'm a list!\n", stderr=None): + _ = core.Fire(ident, command=['special'], serialize=serialize) with self.assertRaises(core.FireError): core.Fire(ident, command=['asdf'], serialize=55) From a186073a06bbbe1e5c72234c72084e083344a652 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 16 Apr 2022 17:31:09 -0400 Subject: [PATCH 2/3] line too long --- fire/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fire/core.py b/fire/core.py index c554ca3d..4546b273 100644 --- a/fire/core.py +++ b/fire/core.py @@ -252,7 +252,8 @@ def _PrintResult(component_trace, verbose=False, serialize=None): # custom formatting. if serialize: if not callable(serialize): - raise FireError('The argument `serialize` must be empty or callable:', serialize) + raise FireError( + 'The argument `serialize` must be empty or callable:', serialize) result = serialize(result) if value_types.HasCustomStr(result): From 2a0b6055e597f5273de63b303c696e843529d00b Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 16 Apr 2022 17:33:08 -0400 Subject: [PATCH 3/3] Make test deterministic --- fire/core_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fire/core_test.py b/fire/core_test.py index e9987da6..0d11467e 100644 --- a/fire/core_test.py +++ b/fire/core_test.py @@ -199,7 +199,7 @@ def serialize(x): if isinstance(x, list): return ', '.join(str(xi) for xi in x) if isinstance(x, dict): - return ', '.join('{}={!r}'.format(k, v) for k, v in x.items()) + return ', '.join('{}={!r}'.format(k, v) for k, v in sorted(x.items())) if x == 'special': return ['SURPRISE!!', "I'm a list!"] return x