From b7cadfc53a65dd294fade8614517d693f8b3b677 Mon Sep 17 00:00:00 2001 From: dlee Date: Tue, 14 Feb 2023 11:38:35 -0600 Subject: [PATCH] Fixes bad practice of naming variable a built-in type --- newsfragments/3976.minor | 1 + src/allmydata/web/status.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 newsfragments/3976.minor diff --git a/newsfragments/3976.minor b/newsfragments/3976.minor new file mode 100644 index 000000000..4d6245e73 --- /dev/null +++ b/newsfragments/3976.minor @@ -0,0 +1 @@ +Fixes variable name same as built-in type. \ No newline at end of file diff --git a/src/allmydata/web/status.py b/src/allmydata/web/status.py index a413348c4..1bcf0979f 100644 --- a/src/allmydata/web/status.py +++ b/src/allmydata/web/status.py @@ -1616,30 +1616,30 @@ class StatisticsElement(Element): @renderer def uploads(self, req, tag): files = self._stats["counters"].get("uploader.files_uploaded", 0) - bytes = self._stats["counters"].get("uploader.bytes_uploaded", 0) + bytes_uploaded = self._stats["counters"].get("uploader.bytes_uploaded", 0) return tag(("%s files / %s bytes (%s)" % - (files, bytes, abbreviate_size(bytes)))) + (files, bytes_uploaded, abbreviate_size(bytes_uploaded)))) @renderer def downloads(self, req, tag): files = self._stats["counters"].get("downloader.files_downloaded", 0) - bytes = self._stats["counters"].get("downloader.bytes_downloaded", 0) + bytes_uploaded = self._stats["counters"].get("downloader.bytes_downloaded", 0) return tag("%s files / %s bytes (%s)" % - (files, bytes, abbreviate_size(bytes))) + (files, bytes_uploaded, abbreviate_size(bytes_uploaded))) @renderer def publishes(self, req, tag): files = self._stats["counters"].get("mutable.files_published", 0) - bytes = self._stats["counters"].get("mutable.bytes_published", 0) - return tag("%s files / %s bytes (%s)" % (files, bytes, - abbreviate_size(bytes))) + bytes_uploaded = self._stats["counters"].get("mutable.bytes_published", 0) + return tag("%s files / %s bytes (%s)" % (files, bytes_uploaded, + abbreviate_size(bytes_uploaded))) @renderer def retrieves(self, req, tag): files = self._stats["counters"].get("mutable.files_retrieved", 0) - bytes = self._stats["counters"].get("mutable.bytes_retrieved", 0) - return tag("%s files / %s bytes (%s)" % (files, bytes, - abbreviate_size(bytes))) + bytes_uploaded = self._stats["counters"].get("mutable.bytes_retrieved", 0) + return tag("%s files / %s bytes (%s)" % (files, bytes_uploaded, + abbreviate_size(bytes_uploaded))) @renderer def raw(self, req, tag):