paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: Clean up getattr, setattr, delattr calls with literal names.

Browse Source 
These were useful as a transitional workaround to ignore type errors
that only show up with django-stubs, while avoiding errors about
unused type: ignore comments without django-stubs.  Now that the
django-stubs transition is complete, switch to type: ignore comments
so that mypy will tell us if they become unnecessary.  Many already
have.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-10-07 21:10:17 -07:00
committed by Tim Abbott
parent 5e1ebf2861
commit 1385a827c2
17 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
zerver/lib/logging_util.py
View File

@@ -197,12 +197,10 @@ class ZulipFormatter(logging.Formatter):
return " ".join(pieces)
def format(self, record: logging.LogRecord) -> str:
if not getattr(record, "zulip_decorated", False):
# The `setattr` calls put this logic explicitly outside the bounds of the
# type system; otherwise mypy would complain LogRecord lacks these attributes.
setattr(record, "zulip_level_abbrev", abbrev_log_levelname(record.levelname))
setattr(record, "zulip_origin", find_log_origin(record))
setattr(record, "zulip_decorated", True)
if not hasattr(record, "zulip_decorated"):
record.zulip_level_abbrev = abbrev_log_levelname(record.levelname)
record.zulip_origin = find_log_origin(record)
record.zulip_decorated = True
return super().format(record)
@@ -227,12 +225,12 @@ class ZulipWebhookFormatter(ZulipFormatter):
request = get_current_request()
if not request:
setattr(record, "user", None)
setattr(record, "client", None)
setattr(record, "url", None)
setattr(record, "content_type", None)
setattr(record, "custom_headers", None)
setattr(record, "payload", None)
record.user = None
record.client = None
record.url = None
record.content_type = None
record.custom_headers = None
record.payload = None
return super().format(record)
if request.content_type == "application/json":
@@ -257,12 +255,12 @@ class ZulipWebhookFormatter(ZulipFormatter):
assert client is not None
assert request.user.is_authenticated
setattr(record, "user", f"{request.user.delivery_email} ({request.user.realm.string_id})")
setattr(record, "client", client.name)
setattr(record, "url", request.META.get("PATH_INFO", None))
setattr(record, "content_type", request.content_type)
setattr(record, "custom_headers", header_text or None)
setattr(record, "payload", payload)
record.user = f"{request.user.delivery_email} ({request.user.realm.string_id})"
record.client = client.name
record.url = request.META.get("PATH_INFO", None)
record.content_type = request.content_type
record.custom_headers = header_text or None
record.payload = payload
return super().format(record)