openstack/nova
Code Issues Proposed changes

Merge "Fix typo in image_meta.py & checks.py & flavor.py"

Browse Source
This commit is contained in:
Jenkins 2016-12-26 14:09:59 +00:00 committed by Gerrit Code Review
commit aa77e0bd17
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/hacking/checks.py
View File

@ -510,7 +510,7 @@ class _FindVariableReferences(ast.NodeVisitor):
# variable 'foo' was used like: # variable 'foo' was used like:
# mocked_thing.bar = foo # mocked_thing.bar = foo
# foo() # foo()
# self.assertRaises(excepion, foo) # self.assertRaises(exception, foo)
self._references.append(node.id) self._references.append(node.id)
super(_FindVariableReferences, self).generic_visit(node) super(_FindVariableReferences, self).generic_visit(node)

2
nova/objects/flavor.py
View File

@ -203,7 +203,7 @@ class Flavor(base.NovaPersistentObject, base.NovaObject,
base.NovaObjectDictCompat): base.NovaObjectDictCompat):
# Version 1.0: Initial version # Version 1.0: Initial version
# Version 1.1: Added save_projects(), save_extra_specs(), removed # Version 1.1: Added save_projects(), save_extra_specs(), removed
# remoteable from save() # remotable from save()
VERSION = '1.1' VERSION = '1.1'
fields = { fields = {

2
nova/objects/image_meta.py
View File

@ -100,7 +100,7 @@ class ImageMeta(base.NovaObject):
# in ImageMeta initially by mistake. To keep compatibility with compute # in ImageMeta initially by mistake. To keep compatibility with compute
# nodes which are run with previous versions these fields are still # nodes which are run with previous versions these fields are still
# not nullable in ImageMeta, but the code below converts None to # not nullable in ImageMeta, but the code below converts None to
# approppriate empty values. # appropriate empty values.
for fld in NULLABLE_STRING_FIELDS: for fld in NULLABLE_STRING_FIELDS:
if fld in image_meta and image_meta[fld] is None: if fld in image_meta and image_meta[fld] is None:
image_meta[fld] = '' image_meta[fld] = ''