Merge "Fixed several typos in comments"
This commit is contained in:
commit
542ae1ad73
@ -725,7 +725,7 @@ class Site(Registry, HorizonComponent):
|
||||
"""Lazy loading for URL patterns.
|
||||
|
||||
This method avoids problems associated with attempting to evaluate
|
||||
the the URLconf before the settings module has been loaded.
|
||||
the URLconf before the settings module has been loaded.
|
||||
"""
|
||||
def url_patterns():
|
||||
return self._urls()[0]
|
||||
|
@ -58,7 +58,7 @@ class Command(TemplateCommand):
|
||||
dashboard_path = options.get('dashboard')
|
||||
dashboard_mod_path = ".".join([dashboard_path, "dashboard"])
|
||||
|
||||
# Check the the dashboard.py file in the dashboard app can be imported.
|
||||
# Check the dashboard.py file in the dashboard app can be imported.
|
||||
# Add the dashboard information to our options to pass along if all
|
||||
# goes well.
|
||||
try:
|
||||
|
@ -195,12 +195,12 @@ class JasmineTests(SeleniumTestCase):
|
||||
|
||||
.. attribute:: sources
|
||||
|
||||
A list of of JS source files (the {{STATIC_URL}} will be added
|
||||
A list of JS source files (the {{STATIC_URL}} will be added
|
||||
automatically, these are the source files tested
|
||||
|
||||
.. attribute:: specs
|
||||
|
||||
A list of of Jasmine JS spec files (the {{STATIC_URL}} will be added
|
||||
A list of Jasmine JS spec files (the {{STATIC_URL}} will be added
|
||||
automatically
|
||||
|
||||
.. attribute:: template_name
|
||||
|
@ -175,7 +175,7 @@ class QuotaSet(Sequence):
|
||||
|
||||
def __add__(self, other):
|
||||
"""Merge another QuotaSet into this one. Existing quotas are
|
||||
not overriden.
|
||||
not overridden.
|
||||
"""
|
||||
if not isinstance(other, QuotaSet):
|
||||
msg = "Can only add QuotaSet to QuotaSet, " \
|
||||
|
@ -117,7 +117,7 @@ class Resource(base.APIResourceWrapper):
|
||||
def __init__(self, apiresource, ceilometer_usage=None):
|
||||
super(Resource, self).__init__(apiresource)
|
||||
|
||||
# Save empty strings to IDs rather then None, sop it gets
|
||||
# Save empty strings to IDs rather than None, so it gets
|
||||
# serialized correctly. We don't want 'None' strings.
|
||||
self.project_id = self.project_id or ""
|
||||
self.user_id = self.user_id or ""
|
||||
|
@ -257,6 +257,6 @@ if DEBUG:
|
||||
# during django reloads and an active user is logged in, the monkey
|
||||
# patch below will not otherwise be applied in time - resulting in developers
|
||||
# appearing to be logged out. In typical production deployments this section
|
||||
# below may be ommited, though it should not be harmful
|
||||
# below may be omitted, though it should not be harmful
|
||||
from openstack_auth import utils as auth_utils
|
||||
auth_utils.patch_middleware_get_user()
|
||||
|
@ -170,7 +170,7 @@ def data(TEST):
|
||||
'protected': False}
|
||||
multi_prop_image = images.Image(images.ImageManager(None), image_dict)
|
||||
|
||||
# An image wihout name being returned based on current api
|
||||
# An image without name being returned based on current api
|
||||
image_dict = {'id': 'c8756975-7a3b-4e43-b7f7-433576112849',
|
||||
'status': "active",
|
||||
'size': 8 * 1024 ** 3,
|
||||
|
Loading…
Reference in New Issue
Block a user