openstack/horizon
Code Issues Proposed changes

Merge "Fixed several typos in comments"

Browse Source
This commit is contained in:
Jenkins 2014-05-27 05:56:58 +00:00 committed by Gerrit Code Review
commit 542ae1ad73
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/base.py
View File

@ -725,7 +725,7 @@ class Site(Registry, HorizonComponent):
"""Lazy loading for URL patterns. """Lazy loading for URL patterns.
This method avoids problems associated with attempting to evaluate 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(): def url_patterns():
return self._urls()[0] return self._urls()[0]

2
horizon/management/commands/startpanel.py
View File

@ -58,7 +58,7 @@ class Command(TemplateCommand):
dashboard_path = options.get('dashboard') dashboard_path = options.get('dashboard')
dashboard_mod_path = ".".join([dashboard_path, "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 # Add the dashboard information to our options to pass along if all
# goes well. # goes well.
try: try:

4
horizon/test/helpers.py
View File

@ -195,12 +195,12 @@ class JasmineTests(SeleniumTestCase):
.. attribute:: sources .. 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 automatically, these are the source files tested
.. attribute:: specs .. 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 automatically
.. attribute:: template_name .. attribute:: template_name

2
openstack_dashboard/api/base.py
View File

@ -175,7 +175,7 @@ class QuotaSet(Sequence):
def __add__(self, other): def __add__(self, other):
"""Merge another QuotaSet into this one. Existing quotas are """Merge another QuotaSet into this one. Existing quotas are
not overriden. not overridden.
""" """
if not isinstance(other, QuotaSet): if not isinstance(other, QuotaSet):
msg = "Can only add QuotaSet to QuotaSet, " \ msg = "Can only add QuotaSet to QuotaSet, " \

2
openstack_dashboard/api/ceilometer.py
View File

@ -117,7 +117,7 @@ class Resource(base.APIResourceWrapper):
def __init__(self, apiresource, ceilometer_usage=None): def __init__(self, apiresource, ceilometer_usage=None):
super(Resource, self).__init__(apiresource) 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. # serialized correctly. We don't want 'None' strings.
self.project_id = self.project_id or "" self.project_id = self.project_id or ""
self.user_id = self.user_id or "" self.user_id = self.user_id or ""

2
openstack_dashboard/settings.py
View File

@ -257,6 +257,6 @@ if DEBUG:
# during django reloads and an active user is logged in, the monkey # during django reloads and an active user is logged in, the monkey
# patch below will not otherwise be applied in time - resulting in developers # patch below will not otherwise be applied in time - resulting in developers
# appearing to be logged out. In typical production deployments this section # 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 from openstack_auth import utils as auth_utils
auth_utils.patch_middleware_get_user() auth_utils.patch_middleware_get_user()

2
openstack_dashboard/test/test_data/glance_data.py
View File

@ -170,7 +170,7 @@ def data(TEST):
'protected': False} 'protected': False}
multi_prop_image = images.Image(images.ImageManager(None), image_dict) 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', image_dict = {'id': 'c8756975-7a3b-4e43-b7f7-433576112849',
'status': "active", 'status': "active",
'size': 8 * 1024 ** 3, 'size': 8 * 1024 ** 3,