diff options
| author | Дилян Палаузов <dilyanpalauzov@users.noreply.github.com> | 2017-11-06 22:11:39 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-06 22:41:23 -0500 |
| commit | e68baf386219ab64539ba5cef628811be03fdb84 (patch) | |
| tree | c91ea8f0b79ba3a9edc66db32c3ed18ea6ebf837 /django/core | |
| parent | bcaef2c91d234fe742973eb7df8a47f2048d3e63 (diff) | |
[2.0.x] Fixed #28776 -- Fixed a/an/and typos in docs and comments.
Backport of 6c0042430e3618ce5c276d195d92a6b884daa3a3 from master
Diffstat (limited to 'django/core')
| -rw-r--r-- | django/core/files/uploadedfile.py | 2 | ||||
| -rw-r--r-- | django/core/mail/backends/filebased.py | 2 | ||||
| -rw-r--r-- | django/core/management/commands/loaddata.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/django/core/files/uploadedfile.py b/django/core/files/uploadedfile.py index 3ba7f995c6..8f1d26ea5f 100644 --- a/django/core/files/uploadedfile.py +++ b/django/core/files/uploadedfile.py @@ -15,7 +15,7 @@ __all__ = ('UploadedFile', 'TemporaryUploadedFile', 'InMemoryUploadedFile', class UploadedFile(File): """ - A abstract uploaded file (``TemporaryUploadedFile`` and + An abstract uploaded file (``TemporaryUploadedFile`` and ``InMemoryUploadedFile`` are the built-in concrete subclasses). An ``UploadedFile`` object behaves somewhat like a file object and diff --git a/django/core/mail/backends/filebased.py b/django/core/mail/backends/filebased.py index 2d1238665e..ddcd9ed97b 100644 --- a/django/core/mail/backends/filebased.py +++ b/django/core/mail/backends/filebased.py @@ -21,7 +21,7 @@ class EmailBackend(ConsoleEmailBackend): if not isinstance(self.file_path, str): raise ImproperlyConfigured('Path for saving emails is invalid: %r' % self.file_path) self.file_path = os.path.abspath(self.file_path) - # Make sure that self.file_path is an directory if it exists. + # Make sure that self.file_path is a directory if it exists. if os.path.exists(self.file_path) and not os.path.isdir(self.file_path): raise ImproperlyConfigured( 'Path for saving email messages exists, but is not a directory: %s' % self.file_path diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py index 786957e86f..bed6be14e4 100644 --- a/django/core/management/commands/loaddata.py +++ b/django/core/management/commands/loaddata.py @@ -72,7 +72,7 @@ class Command(BaseCommand): self.loaddata(fixture_labels) # Close the DB connection -- unless we're still in a transaction. This - # is required as a workaround for an edge case in MySQL: if the same + # is required as a workaround for an edge case in MySQL: if the same # connection is used to create tables, load data, and query, the query # can return incorrect results. See Django #7572, MySQL #37735. if transaction.get_autocommit(self.using): |