diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-28 17:39:14 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-28 17:39:14 -0700 |
| commit | 1dcc603efff8229838f27019668d864a0bcbfa59 (patch) | |
| tree | 8c67764f440faeb095143498383ca57ecd4f09be /django/core | |
| parent | e79725cdf90e3271626ed66f70b63640d3fcc521 (diff) | |
Fixed several typos in Django
Diffstat (limited to 'django/core')
| -rw-r--r-- | django/core/files/storage.py | 2 | ||||
| -rw-r--r-- | django/core/mail/message.py | 2 | ||||
| -rw-r--r-- | django/core/management/__init__.py | 2 | ||||
| -rw-r--r-- | django/core/management/base.py | 2 | ||||
| -rw-r--r-- | django/core/management/commands/runserver.py | 2 | ||||
| -rw-r--r-- | django/core/management/commands/testserver.py | 2 | ||||
| -rw-r--r-- | django/core/serializers/__init__.py | 2 | ||||
| -rw-r--r-- | django/core/servers/fastcgi.py | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/django/core/files/storage.py b/django/core/files/storage.py index 3e600fb913..98864f7f22 100644 --- a/django/core/files/storage.py +++ b/django/core/files/storage.py @@ -101,7 +101,7 @@ class Storage(object): Returns True if a file referenced by the given name already exists in the storage system, or False if the name is available for a new file. """ - raise NotImplementedError('subclasses of Storage must provide a exists() method') + raise NotImplementedError('subclasses of Storage must provide an exists() method') def listdir(self, path): """ diff --git a/django/core/mail/message.py b/django/core/mail/message.py index cdd265521b..34caa37ffd 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -341,7 +341,7 @@ class EmailMessage(object): content = content.message() elif not isinstance(content, Message): # For compatibility with existing code, parse the message - # into a email.Message object if it is not one already. + # into an email.Message object if it is not one already. content = message_from_string(content) attachment = SafeMIMEMessage(content, subtype) diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index e1a7a16c88..3b4ce960c1 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -252,7 +252,7 @@ class ManagementUtility(object): Subcommand options are saved as pairs. A pair consists of the long option string (e.g. '--exclude') and a boolean value indicating if the option requires arguments. When printing to - stdout, a equal sign is appended to options which require arguments. + stdout, an equal sign is appended to options which require arguments. Note: If debugging this function, it is recommended to write the debug output in a separate file. Otherwise the debug output will be treated diff --git a/django/core/management/base.py b/django/core/management/base.py index 5116b417f4..52f4a074dc 100644 --- a/django/core/management/base.py +++ b/django/core/management/base.py @@ -331,7 +331,7 @@ class BaseCommand(object): try: if (self.requires_system_checks and - not options.get('skip_validation') and # This will be removed at the end of deprecation proccess for `skip_validation`. + not options.get('skip_validation') and # This will be removed at the end of deprecation process for `skip_validation`. not options.get('skip_checks')): self.check() output = self.handle(*args, **options) diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index 28c6337a43..2d7d6bffde 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -28,7 +28,7 @@ DEFAULT_PORT = "8000" class Command(BaseCommand): option_list = BaseCommand.option_list + ( make_option('--ipv6', '-6', action='store_true', dest='use_ipv6', default=False, - help='Tells Django to use a IPv6 address.'), + help='Tells Django to use an IPv6 address.'), make_option('--nothreading', action='store_false', dest='use_threading', default=True, help='Tells Django to NOT use threading.'), make_option('--noreload', action='store_false', dest='use_reloader', default=True, diff --git a/django/core/management/commands/testserver.py b/django/core/management/commands/testserver.py index 0a9c99dcbf..0409660414 100644 --- a/django/core/management/commands/testserver.py +++ b/django/core/management/commands/testserver.py @@ -11,7 +11,7 @@ class Command(BaseCommand): type='string', default='', help='port number or ipaddr:port to run the server on'), make_option('--ipv6', '-6', action='store_true', dest='use_ipv6', default=False, - help='Tells Django to use a IPv6 address.'), + help='Tells Django to use an IPv6 address.'), ) help = 'Runs a development server with data from the given fixture(s).' args = '[fixture ...]' diff --git a/django/core/serializers/__init__.py b/django/core/serializers/__init__.py index 3720c770d5..68200e754f 100644 --- a/django/core/serializers/__init__.py +++ b/django/core/serializers/__init__.py @@ -132,7 +132,7 @@ def serialize(format, queryset, **options): def deserialize(format, stream_or_string, **options): """ Deserialize a stream or a string. Returns an iterator that yields ``(obj, - m2m_relation_dict)``, where ``obj`` is a instantiated -- but *unsaved* -- + m2m_relation_dict)``, where ``obj`` is an instantiated -- but *unsaved* -- object, and ``m2m_relation_dict`` is a dictionary of ``{m2m_field_name : list_of_related_objects}``. """ diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py index 1dcd22723c..b44473baed 100644 --- a/django/core/servers/fastcgi.py +++ b/django/core/servers/fastcgi.py @@ -3,7 +3,7 @@ FastCGI (or SCGI, or AJP1.3 ...) server that implements the WSGI protocol. Uses the flup python package: http://www.saddi.com/software/flup/ -This is a adaptation of the flup package to add FastCGI server support +This is an adaptation of the flup package to add FastCGI server support to run Django apps from Web servers that support the FastCGI protocol. This module can be run standalone or from the django-admin / manage.py scripts using the "runfcgi" directive. |
