From 86e8a3a315dcf4bbfb9fc3088a8308e2082c066b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 21 Jan 2023 15:08:59 +0000 Subject: [PATCH] fix flake8 E711 (comparison-to-none) --- lnbits/core/crud.py | 2 +- lnbits/core/helpers.py | 2 +- lnbits/core/views/generic.py | 2 +- lnbits/extensions/gerty/number_prefixer.py | 4 ++-- lnbits/extensions/jukebox/crud.py | 2 +- lnbits/extensions/lnurlp/views_api.py | 2 +- lnbits/extensions/offlineshop/views_api.py | 2 +- lnbits/extensions/subdomains/util.py | 2 +- lnbits/wallets/base.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py index 8dc506bd2..16cde8356 100644 --- a/lnbits/core/crud.py +++ b/lnbits/core/crud.py @@ -358,7 +358,7 @@ async def get_payments( args: List[Any] = [] clause: List[str] = [] - if since != None: + if since is not None: if db.type == POSTGRES: clause.append("time > to_timestamp(?)") elif db.type == COCKROACH: diff --git a/lnbits/core/helpers.py b/lnbits/core/helpers.py index 7d5c2920a..214fee2fa 100644 --- a/lnbits/core/helpers.py +++ b/lnbits/core/helpers.py @@ -37,7 +37,7 @@ async def run_migration(db: Connection, migrations_module: Any, current_version: print(f"running migration {db_name}.{version}") await migrate(db) - if db.schema == None: + if db.schema is None: await update_migration_version(db, db_name, version) else: async with core_db.connect() as conn: diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py index 0dd8af5fc..dcd7e8c8b 100644 --- a/lnbits/core/views/generic.py +++ b/lnbits/core/views/generic.py @@ -120,7 +120,7 @@ async def extensions_install( ) ) await update_installed_extension_state( - ext_id=ext_id, active=activate != None + ext_id=ext_id, active=activate is not None ) all_extensions = list(map(lambda e: e.code, get_valid_extensions())) diff --git a/lnbits/extensions/gerty/number_prefixer.py b/lnbits/extensions/gerty/number_prefixer.py index eab684e7a..dca001087 100644 --- a/lnbits/extensions/gerty/number_prefixer.py +++ b/lnbits/extensions/gerty/number_prefixer.py @@ -31,7 +31,7 @@ def si_formatter(value): the value cannot be classified. """ classifier = si_classifier(value) - if classifier == None: + if classifier is None: # Don't know how to classify this value return None @@ -48,7 +48,7 @@ def si_format(value, precision=4, long_form=False, separator=""): """ scaled, short_suffix, long_suffix = si_formatter(value) - if scaled == None: + if scaled is None: # Don't know how to format this value return value diff --git a/lnbits/extensions/jukebox/crud.py b/lnbits/extensions/jukebox/crud.py index fe710f601..f046727b2 100644 --- a/lnbits/extensions/jukebox/crud.py +++ b/lnbits/extensions/jukebox/crud.py @@ -58,7 +58,7 @@ async def get_jukebox_by_user(user: str) -> Optional[Jukebox]: async def get_jukeboxs(user: str) -> List[Jukebox]: rows = await db.fetchall('SELECT * FROM jukebox.jukebox WHERE "user" = ?', (user,)) for row in rows: - if row.sp_playlists == None: + if row.sp_playlists is None: await delete_jukebox(row.id) rows = await db.fetchall('SELECT * FROM jukebox.jukebox WHERE "user" = ?', (user,)) diff --git a/lnbits/extensions/lnurlp/views_api.py b/lnbits/extensions/lnurlp/views_api.py index a7bf0761a..badaaebfa 100644 --- a/lnbits/extensions/lnurlp/views_api.py +++ b/lnbits/extensions/lnurlp/views_api.py @@ -83,7 +83,7 @@ async def api_link_create_or_update( detail="Min is greater than max.", status_code=HTTPStatus.BAD_REQUEST ) - if data.currency == None and ( + if data.currency is None and ( round(data.min) != data.min or round(data.max) != data.max or data.min < 1 ): raise HTTPException( diff --git a/lnbits/extensions/offlineshop/views_api.py b/lnbits/extensions/offlineshop/views_api.py index 1b8abb495..22dca69b1 100644 --- a/lnbits/extensions/offlineshop/views_api.py +++ b/lnbits/extensions/offlineshop/views_api.py @@ -78,7 +78,7 @@ async def api_add_or_update_item( ) if data.unit != "sat": data.price = data.price * 100 - if item_id == None: + if item_id is None: await add_item( shop.id, diff --git a/lnbits/extensions/subdomains/util.py b/lnbits/extensions/subdomains/util.py index 88f6e1341..9265e870a 100644 --- a/lnbits/extensions/subdomains/util.py +++ b/lnbits/extensions/subdomains/util.py @@ -12,7 +12,7 @@ def isValidDomain(str): # If the string is empty # return false - if str == None: + if str is None: return False # Return if the string diff --git a/lnbits/wallets/base.py b/lnbits/wallets/base.py index ecc6892e8..68e49c9d0 100644 --- a/lnbits/wallets/base.py +++ b/lnbits/wallets/base.py @@ -41,7 +41,7 @@ class PaymentStatus(NamedTuple): return "settled" elif self.paid is False: return "failed" - elif self.paid == None: + elif self.paid is None: return "still pending" else: return "unknown (should never happen)"