summaryrefslogtreecommitdiff
path: root/django/db/utils.py
diff options
context:
space:
mode:
authorAnton Samarchyan <anton.samarchyan@savoirfairelinux.com>2017-01-24 18:04:12 -0500
committerTim Graham <timograham@gmail.com>2017-02-28 09:17:27 -0500
commit60e52a047e55bc4cd5a93a8bd4d07baed27e9a22 (patch)
tree010a363968b1ed41adf2e64c98d572d7148a2a5e /django/db/utils.py
parentd6e26e5b7c8063c2cc5aa045edea6555bf358fc2 (diff)
downloaddjango-60e52a047e55bc4cd5a93a8bd4d07baed27e9a22.tar.gz
Refs #27656 -- Updated django.db docstring verbs according to PEP 257.
Diffstat (limited to 'django/db/utils.py')
-rw-r--r--django/db/utils.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/django/db/utils.py b/django/db/utils.py
index 1bf44cbe26..6c9b489040 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -50,7 +50,7 @@ class NotSupportedError(DatabaseError):
class DatabaseErrorWrapper:
"""
- Context manager and decorator that re-throws backend-specific database
+ Context manager and decorator that reraises backend-specific database
exceptions using Django's common wrappers.
"""
@@ -161,7 +161,7 @@ class ConnectionHandler:
def ensure_defaults(self, alias):
"""
- Puts the defaults into the settings dictionary for a given connection
+ Put the defaults into the settings dictionary for a given connection
where no settings is provided.
"""
try:
@@ -182,7 +182,7 @@ class ConnectionHandler:
def prepare_test_settings(self, alias):
"""
- Makes sure the test settings are available in the 'TEST' sub-dictionary.
+ Make sure the test settings are available in the 'TEST' sub-dictionary.
"""
try:
conn = self.databases[alias]
@@ -229,7 +229,7 @@ class ConnectionHandler:
class ConnectionRouter:
def __init__(self, routers=None):
"""
- If routers is not specified, will default to settings.DATABASE_ROUTERS.
+ If routers is not specified, default to settings.DATABASE_ROUTERS.
"""
self._routers = routers
@@ -304,8 +304,6 @@ class ConnectionRouter:
)
def get_migratable_models(self, app_config, db, include_auto_created=False):
- """
- Return app models allowed to be synchronized on provided db.
- """
+ """Return app models allowed to be migrated on provided db."""
models = app_config.get_models(include_auto_created=include_auto_created)
return [model for model in models if self.allow_migrate_model(db, model)]