Skip to content

Commit 84e9033

Browse files
authored
Merge pull request #1269 from mulkieran/str-None-None
Get rid of redundant "None" if None expressions
2 parents aa64ef9 + 5961d15 commit 84e9033

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/stratis_cli/_actions/_list_filesystem.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def filesystem_size_quartet(
150150
)
151151
)
152152
)
153-
return f'{triple_str} / {"None" if limit is None else limit}'
153+
return f"{triple_str} / {limit}"
154154

155155
tables = [
156156
(
@@ -209,7 +209,7 @@ def display(self):
209209
print()
210210
print(f"Created: {created}")
211211
print()
212-
print(f'Snapshot origin: {"None" if origin is None else origin}')
212+
print(f"Snapshot origin: {origin}")
213213
if origin is not None:
214214
scheduled = "Yes" if fs.MergeScheduled() else "No"
215215
print(f" Revert scheduled: {scheduled}")
@@ -225,4 +225,4 @@ def display(self):
225225
f"{TABLE_FAILURE_STRING if size_triple.free() is None else size_triple.free()}"
226226
)
227227
print()
228-
print(f" Size Limit: {'None' if limit is None else limit}")
228+
print(f" Size Limit: {limit}")

src/stratis_cli/_actions/_list_pool.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,7 @@ def _print_detail_view(
367367

368368
metadata_version = _metadata_version(mopool)
369369

370-
print(
371-
f'Metadata Version: {"none" if metadata_version is None else metadata_version}'
372-
)
370+
print(f"Metadata Version: {metadata_version}")
373371

374372
print(
375373
f"Actions Allowed: "

0 commit comments

Comments
 (0)