Merge "Fix typo and make docstring more clear"

doc/source/conf.py

@@ -80,7 +80,7 @@ show_authors = False
 # a list of builtin themes.
 
 if not on_rtd:
-    #TODO(efedorova): Change local theme to corresponds with the theme on rtd
+    #TODO(efedorova): Change local theme to correspond with the theme on rtd
     pass
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,

murano/cfapi/cfapi.py

@@ -216,7 +216,7 @@ class Controller(object):
         LOG.debug('Got service {0}'.format(service))
 
         # NOTE(starodubcevna): Here we need to find an action which will return
-        # us needed credentials. By default we will looking for getCredentials
+        # us needed credentials. By default we will look for getCredentials
         # action.
         result = {}
         try:

murano/common/wsgi.py

@@ -566,7 +566,7 @@ class XMLDictSerializer(DictSerializer):
         self._add_xmlns(node, has_atom)
         return node.toprettyxml(indent='    ', encoding='UTF-8')
 
-    # NOTE (ameade): the has_atom should be removed after all of the
+    # NOTE (ameade): the has_atom should be removed after all the
     # xml serializers and view builders have been updated to the current
     # spec that required all responses include the xmlns:atom, the has_atom
     # flag is to prevent current tests from breaking
@@ -1025,14 +1025,14 @@ class XMLDeserializer(TextDeserializer):
             return result
 
     def find_first_child_named(self, parent, name):
-        """Search a nodes children for the first child with a given name."""
+        """Find first child which has the given name of a node."""
         for node in parent.childNodes:
             if node.nodeName == name:
                 return node
         return None
 
     def find_children_named(self, parent, name):
-        """Return all of a nodes children who have the given name."""
+        """Return all children of a node with the given name."""
         for node in parent.childNodes:
             if node.nodeName == name:
                 yield node

murano/db/catalog/api.py

@@ -127,7 +127,7 @@ def _get_tags(tag_names, session=None):
             tag_obj = _existing_tag(tag_name, session)
             if not tag_obj:
                 try:
-                    # Start a new SAVEPOINT transaction. If it fails only
+                    # Start a new SAVEPOINT transaction. If it fails
                     # only the savepoint will be roll backed, not the
                     # whole transaction.
                     with session.begin(nested=True):

murano/db/services/sessions.py

@@ -84,7 +84,7 @@ class SessionServices(object):
         # if other session is deploying now current session is invalid
         unit = db_session.get_session()
 
-        # if environment version is higher then version on which current
+        # if environment version is higher than version on which current
         #  session is created then other session was already deployed
         current_env = unit.query(models.Environment).\
             get(session.environment_id)

murano/engine/package_loader.py

@@ -243,7 +243,7 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
                     _LE('Unable to load package from cache. Clean-up.'))
                 shutil.rmtree(package_directory, ignore_errors=True)
 
-        # the package is not yet in cache, let's try and download it.
+        # the package is not yet in cache, let's try to download it.
         download_lock_path = os.path.join(
             self._cache_directory, '{}_download.lock'.format(package_id))
         download_ipc_lock = m_utils.ExclusiveInterProcessLock(