From 26be703fe679a58bbdccf37a276a9c430ccb29f7 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sun, 19 Jan 2020 14:13:58 -0800
Subject: [PATCH] Changed re-raising an exception to use bare raise syntax
where appropriate.
---
django/db/backends/mysql/creation.py | 2 +-
django/db/backends/postgresql/creation.py | 2 +-
django/db/migrations/loader.py | 2 +-
django/db/models/query.py | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py
index e51de0faa1a..c9330819e55 100644
--- a/django/db/backends/mysql/creation.py
+++ b/django/db/backends/mysql/creation.py
@@ -26,7 +26,7 @@ class DatabaseCreation(BaseDatabaseCreation):
self.log('Got an error creating the test database: %s' % e)
sys.exit(2)
else:
- raise e
+ raise
def _clone_test_db(self, suffix, verbosity, keepdb=False):
source_database_name = self.connection.settings_dict['NAME']
diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py
index 09af818b1e2..0cb26a4341b 100644
--- a/django/db/backends/postgresql/creation.py
+++ b/django/db/backends/postgresql/creation.py
@@ -48,7 +48,7 @@ class DatabaseCreation(BaseDatabaseCreation):
elif not keepdb:
# If the database should be kept, ignore "database already
# exists".
- raise e
+ raise
def _clone_test_db(self, suffix, verbosity, keepdb=False):
# CREATE DATABASE ... WITH TEMPLATE ... requires closing connections
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py
index 6be80482993..09a58d1e241 100644
--- a/django/db/migrations/loader.py
+++ b/django/db/migrations/loader.py
@@ -269,7 +269,7 @@ class MigrationLoader:
),
exc.node
) from exc
- raise exc
+ raise
self.graph.ensure_not_cyclic()
def check_consistent_history(self, connection):
diff --git a/django/db/models/query.py b/django/db/models/query.py
index f8be008a62e..005fde44c67 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -607,13 +607,13 @@ class QuerySet:
params = dict(resolve_callables(params))
obj = self.create(**params)
return obj, True
- except IntegrityError as e:
+ except IntegrityError:
try:
qs = self.select_for_update() if lock else self
return qs.get(**lookup), False
except self.model.DoesNotExist:
pass
- raise e
+ raise
def _extract_model_params(self, defaults, **kwargs):
"""