summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pope <nick@nickpope.me.uk>2022-10-28 14:51:34 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2022-10-31 12:31:13 +0100
commit2bc47d7fe95ec9fc62bc5c0d2408944e5269d9d0 (patch)
treef5f7d7dffc2493b812837e490c42549031d0af02
parentd3cb91db87b78629c0d2682630e90a048275179e (diff)
downloaddjango-2bc47d7fe95ec9fc62bc5c0d2408944e5269d9d0.tar.gz
Avoided assignment followed by immediate return.
Identified using the following command: $ pcre2grep --line-number --multiline --recursive \ "(?s)(\n +)(\w+) = [^\n]+\1return \2;?$" \ django docs extras js_tests scripts tests
-rw-r--r--django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js6
-rw-r--r--django/contrib/admin/static/admin/js/urlify.js3
-rw-r--r--django/contrib/gis/geos/polygon.py3
-rw-r--r--tests/middleware/tests.py3
-rw-r--r--tests/test_runner/tests.py3
5 files changed, 6 insertions, 12 deletions
diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
index 752dcad7bf..afb6b66c25 100644
--- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
+++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
@@ -26,13 +26,11 @@
}
function addPopupIndex(name) {
- name = name + "__" + (popupIndex + 1);
- return name;
+ return name + "__" + (popupIndex + 1);
}
function removePopupIndex(name) {
- name = name.replace(new RegExp("__" + (popupIndex + 1) + "$"), '');
- return name;
+ return name.replace(new RegExp("__" + (popupIndex + 1) + "$"), '');
}
function showAdminPopup(triggeringLink, name_regexp, add_popup) {
diff --git a/django/contrib/admin/static/admin/js/urlify.js b/django/contrib/admin/static/admin/js/urlify.js
index 61dedb23e9..9fc0409496 100644
--- a/django/contrib/admin/static/admin/js/urlify.js
+++ b/django/contrib/admin/static/admin/js/urlify.js
@@ -163,8 +163,7 @@
s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
s = s.replace(/[-\s]+/g, '-'); // convert spaces to hyphens
s = s.substring(0, num_chars); // trim to first num_chars chars
- s = s.replace(/-+$/g, ''); // trim any trailing hyphens
- return s;
+ return s.replace(/-+$/g, ''); // trim any trailing hyphens
}
window.URLify = URLify;
}
diff --git a/django/contrib/gis/geos/polygon.py b/django/contrib/gis/geos/polygon.py
index a660adb8d4..6f76b57005 100644
--- a/django/contrib/gis/geos/polygon.py
+++ b/django/contrib/gis/geos/polygon.py
@@ -110,8 +110,7 @@ class Polygon(GEOSGeometry):
if isinstance(param, LinearRing):
return param
try:
- ring = LinearRing(param)
- return ring
+ return LinearRing(param)
except TypeError:
raise TypeError(msg)
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index 63eaa5d28f..6009350365 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -1027,8 +1027,7 @@ class ETagGZipMiddlewareTest(SimpleTestCase):
"""
def get_response(req):
- response = HttpResponse(self.compressible_string)
- return response
+ return HttpResponse(self.compressible_string)
def get_cond_response(req):
return ConditionalGetMiddleware(get_response)(req)
diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py
index 30ea4ea670..c4946c3e58 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -156,8 +156,7 @@ class TestSuiteTests(SimpleTestCase):
def make_tests(self):
"""Return an iterable of tests."""
suite = self.make_test_suite()
- tests = list(iter_test_cases(suite))
- return tests
+ return list(iter_test_cases(suite))
def test_shuffle_tests(self):
tests = self.make_tests()