summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-01-25 15:14:05 +0100
committerTim Graham <timograham@gmail.com>2017-01-25 09:15:36 -0500
commitc94cb4f86541d8f76ee27652e214fedd0c0920fe (patch)
tree93603bde283d50a96c0f3a87c92399ca8da55b8b
parenta69fc396e47cea763401eaaab92e11a5343e7d3e (diff)
[1.11.x] Removed unused variables that are overwritten.
Backport of ebf34c3cdcd2c75349c60a064427ac255958bf9b from master
-rw-r--r--django/contrib/admindocs/views.py1
-rw-r--r--django/core/validators.py1
-rw-r--r--django/db/backends/mysql/creation.py2
-rw-r--r--django/db/backends/postgresql/creation.py2
-rw-r--r--django/db/models/sql/compiler.py1
-rw-r--r--django/http/multipartparser.py4
-rw-r--r--django/template/base.py2
-rw-r--r--django/utils/dateformat.py1
-rw-r--r--django/utils/ipv6.py1
-rw-r--r--tests/bulk_create/tests.py2
-rw-r--r--tests/migrations/test_base.py2
-rw-r--r--tests/urlpatterns_reverse/tests.py1
12 files changed, 4 insertions, 16 deletions
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index 3488e9fb3a..e29f9a3e83 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -302,7 +302,6 @@ class ModelDetailView(BaseAdminDocsView):
})
else:
arguments = get_func_full_args(func)
- print_arguments = arguments
# Join arguments with ', ' and in case of default value,
# join it with '='. Use repr() so that strings will be
# correctly displayed.
diff --git a/django/core/validators.py b/django/core/validators.py
index 3f777254f4..11a3d8e69f 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -146,7 +146,6 @@ class URLValidator(RegexValidator):
validate_ipv6_address(potential_ip)
except ValidationError:
raise ValidationError(self.message, code=self.code)
- url = value
# The maximum length of a full host name is 253 characters per RFC 1034
# section 3.1. It's defined to be 255 bytes or less, but this includes
diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py
index ae4370935a..c53b9f8335 100644
--- a/django/db/backends/mysql/creation.py
+++ b/django/db/backends/mysql/creation.py
@@ -25,7 +25,7 @@ class DatabaseCreation(BaseDatabaseCreation):
with self._nodb_connection.cursor() as cursor:
try:
cursor.execute("CREATE DATABASE %s" % qn(target_database_name))
- except Exception as e:
+ except Exception:
if keepdb:
return
try:
diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py
index 2f26b14e52..c47bb534f2 100644
--- a/django/db/backends/postgresql/creation.py
+++ b/django/db/backends/postgresql/creation.py
@@ -41,7 +41,7 @@ class DatabaseCreation(BaseDatabaseCreation):
with self._nodb_connection.cursor() as cursor:
try:
cursor.execute(creation_sql)
- except Exception as e:
+ except Exception:
if keepdb:
return
try:
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 37442c06c4..1c6fad4d76 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -824,7 +824,6 @@ class SQLCompiler(object):
"""
Returns an iterator over the results from executing this query.
"""
- converters = None
if results is None:
results = self.execute_sql(MULTI)
fields = [s[0] for s in self.select[0:self.col_count]]
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index 616185f021..cf82e3851e 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -578,15 +578,11 @@ def exhaust(stream_or_iterable):
Raise a MultiPartParserError if the argument is not a stream or an iterable.
"""
- iterator = None
try:
iterator = iter(stream_or_iterable)
except TypeError:
iterator = ChunkIter(stream_or_iterable, 16384)
- if iterator is None:
- raise MultiPartParserError('multipartparser.exhaust() was passed a non-iterable or stream parameter')
-
for __ in iterator:
pass
diff --git a/django/template/base.py b/django/template/base.py
index afdf49cc0e..7871c76749 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -888,7 +888,7 @@ class Variable(object):
if isinstance(current, BaseContext) and getattr(type(current), bit):
raise AttributeError
current = getattr(current, bit)
- except (TypeError, AttributeError) as e:
+ except (TypeError, AttributeError):
# Reraise if the exception was raised by a @property
if not isinstance(current, BaseContext) and bit in dir(current):
raise
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 70650bf625..d40a6c8ddc 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -327,7 +327,6 @@ class DateFormat(TimeFormat):
def W(self):
"ISO-8601 week number of year, weeks starting on Monday"
# Algorithm from http://www.personal.ecu.edu/mccartyr/ISOwdALG.txt
- week_number = None
jan1_weekday = self.data.replace(month=1, day=1).weekday() + 1
weekday = self.data.weekday() + 1
day_of_year = self.z()
diff --git a/django/utils/ipv6.py b/django/utils/ipv6.py
index c41f1e2b46..9b965d5a5e 100644
--- a/django/utils/ipv6.py
+++ b/django/utils/ipv6.py
@@ -228,7 +228,6 @@ def _explode_shorthand_ip_string(ip_str):
# We've already got a longhand ip_str.
return ip_str
- new_ip = []
hextet = ip_str.split('::')
# If there is a ::, we need to expand it with zeroes
diff --git a/tests/bulk_create/tests.py b/tests/bulk_create/tests.py
index 3378f0010a..2555e66ec6 100644
--- a/tests/bulk_create/tests.py
+++ b/tests/bulk_create/tests.py
@@ -208,7 +208,6 @@ class BulkCreateTests(TestCase):
@skipUnlessDBFeature('can_return_ids_from_bulk_insert')
def test_set_pk_and_insert_single_item(self):
- countries = []
with self.assertNumQueries(1):
countries = Country.objects.bulk_create([self.data[0]])
self.assertEqual(len(countries), 1)
@@ -216,7 +215,6 @@ class BulkCreateTests(TestCase):
@skipUnlessDBFeature('can_return_ids_from_bulk_insert')
def test_set_pk_and_query_efficiency(self):
- countries = []
with self.assertNumQueries(1):
countries = Country.objects.bulk_create(self.data)
self.assertEqual(len(countries), 4)
diff --git a/tests/migrations/test_base.py b/tests/migrations/test_base.py
index 7f7f96c013..007c7c0ba9 100644
--- a/tests/migrations/test_base.py
+++ b/tests/migrations/test_base.py
@@ -77,7 +77,7 @@ class MigrationTestBase(TransactionTestCase):
),
)
- def assertFKNotExists(self, table, columns, to, value=True):
+ def assertFKNotExists(self, table, columns, to):
return self.assertFKExists(table, columns, to, False)
@contextmanager
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index bb45972c89..8dbd57a27d 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -422,7 +422,6 @@ class ResolverTests(SimpleTestCase):
e = cm.exception
# make sure we at least matched the root ('/') url resolver:
self.assertIn('tried', e.args[0])
- tried = e.args[0]['tried']
self.assertEqual(
len(e.args[0]['tried']),
len(url_types_names),