Merge "Fix pep8 errors with new hacking"

Author: Zuul

nova/api/openstack/wsgi.py

@@ -694,9 +694,9 @@ def wrapped(*args, **kwargs):
 
                 LOG.exception("Unexpected exception in API method")
                 msg = _("Unexpected API Error. "
-                        "%(support)s\n%(exc)s" % {
-                            'support': version.support_string(),
-                            'exc': type(exc)})
+                        "{support}\n{exc}").format(
+                            support=version.support_string(),
+                            exc=type(exc))
                 raise webob.exc.HTTPInternalServerError(explanation=msg)
 
         return wrapped

nova/cmd/manage.py

@@ -2624,7 +2624,7 @@ def _check_orphaned_allocations_for_provider(self, ctxt, placement,
                     # By default we suspect the orphaned allocation was for a
                     # migration...
                     consumer_type = 'migration'
-                    if not(consumer_uuid in inst_uuids):
+                    if consumer_uuid not in inst_uuids:
                         # ... but if we can't find it either for an instance,
                         # that means it was for this.
                         consumer_type = 'instance'
@@ -2798,8 +2798,8 @@ def get_machine_type(self, instance_uuid=None):
                 print(mtype)
                 return 0
             else:
-                print(_('No machine type registered for instance %s' %
-                        instance_uuid))
+                print(_('No machine type registered for instance %s') %
+                      instance_uuid)
                 return 3
         except (exception.InstanceNotFound,
                 exception.InstanceMappingNotFound) as e:

nova/compute/provider_config.py

@@ -229,8 +229,9 @@ def _load_yaml_file(path):
                 if hasattr(ex, 'problem_mark'):
                     pos = ex.problem_mark
                     message += _("File: %s ") % open_file.name
-                    message += _("Error position: (%s:%s)") % (
-                        pos.line + 1, pos.column + 1)
+                    message += _("Error position: "
+                                 "({line}:{column})").format(
+                                     line=pos.line + 1, column=pos.column + 1)
                 raise nova_exc.ProviderConfigException(error=message)
     except OSError:
         message = _("Unable to read yaml config file: %s") % path

nova/console/rfb/authvencrypt.py

@@ -110,10 +110,10 @@ def recv(num):
         # MITM'd Anonymous Diffie Hellmann (DH) cyphers)
         if AuthVeNCryptSubtype.X509NONE not in sub_types:
             reason = _(
-                "Server does not support the %d (%s) VeNCrypt auth subtype"
-            ) % (
-                AuthVeNCryptSubtype.X509NONE.value,
-                AuthVeNCryptSubtype.X509NONE.name)
+                "Server does not support the {value} ({name}) "
+                "VeNCrypt auth subtype"
+            ).format(value=AuthVeNCryptSubtype.X509NONE.value,
+                     name=AuthVeNCryptSubtype.X509NONE.name)
             raise exception.RFBAuthHandshakeFailed(reason=reason)
 
         LOG.debug(

nova/console/securityproxy/rfb.py

@@ -164,19 +164,17 @@ def recv(sock, num):
         if client_auth != auth.AuthType.NONE:
             self._fail(
                 tenant_sock, compute_sock,
-                _("Only the security type %d (%s) is supported") % (
-                    auth.AuthType.NONE.value, auth.AuthType.NONE.name,
-                ))
+                _("Only the security type {value} ({name}) "
+                  "is supported").format(value=auth.AuthType.NONE.value,
+                                         name=auth.AuthType.NONE.name))
 
             reason = _(
-                "Client requested a security type other than %d (%s): "
-                "%d (%s)"
-            ) % (
-                auth.AuthType.NONE.value,
-                auth.AuthType.NONE.name,
-                auth.AuthType(client_auth).value,
-                auth.AuthType(client_auth).name,
-            )
+                "Client requested a security type other than "
+                "{value} ({name}): {client_value} ({client_name})"
+            ).format(value=auth.AuthType.NONE.value,
+                     name=auth.AuthType.NONE.name,
+                     client_value=auth.AuthType(client_auth).value,
+                     client_name=auth.AuthType(client_auth).name)
             raise exception.SecurityProxyNegotiationFailed(reason=reason)
 
         try:

nova/image/glance.py

@@ -389,7 +389,8 @@ def download(self, context, image_id, data=None, dst_path=None,
 
     def _verify_and_write(self, context, image_id, trusted_certs,
                           image_chunks, data, dst_path):
-        """Perform image signature verification and save the image file if needed.
+        """Perform image signature verification and save the image file if
+        needed.
 
         This function writes the content of the image_chunks iterator either to
         a file object provided by the data parameter or to a filepath provided

nova/objects/aggregate.py

@@ -437,7 +437,7 @@ def _get_by_host_from_db(context, host, key=None):
 
 @api_db_api.context_manager.reader
 def _get_by_metadata_from_db(context, key=None, value=None):
-    assert(key is not None or value is not None)
+    assert key is not None or value is not None
     query = context.session.query(api_models.Aggregate)
     query = query.join(api_models.Aggregate._metadata)
     if key is not None:

nova/objects/block_device.py

@@ -168,7 +168,7 @@ def _create_uuid(context, bdm_id):
                 # gave this bdm a uuid
                 result = query.one()
                 uuid = result['uuid']
-                assert(uuid is not None)
+                assert uuid is not None
 
         return uuid
 

nova/objects/instance_numa.py

@@ -49,8 +49,10 @@ def obj_make_compatible(self, primitive, target_version):
                 raise exception.ObjectActionError(
                     action='obj_make_compatible',
                     reason=_(
-                        '%s policy is not supported in version %s'
-                    ) % (primitive['cpu_policy'], target_version))
+                        '{policy} policy is not supported in '
+                        'version {version}'
+                    ).format(policy=primitive['cpu_policy'],
+                             version=target_version))
 
         # NOTE(huaqiang): Since version 1.5, 'cpuset' is modified to track the
         # unpinned CPUs only, with pinned CPUs tracked via 'pcpuset' instead.

nova/scheduler/filters/image_props_filter.py

@@ -82,7 +82,7 @@ def _compare_props(props, other_props):
 
         def _compare_product_version(hyper_version, image_props):
             version_required = image_props.get('img_hv_requested_version')
-            if not(hypervisor_version and version_required):
+            if not (hypervisor_version and version_required):
                 return True
             img_prop_predicate = versionpredicate.VersionPredicate(
                 'image_prop (%s)' % version_required)