Merge "Enable flake8 E129 rule"
This commit is contained in:
commit
5e6a889194
2
tox.ini
2
tox.ini
@ -58,7 +58,7 @@ ignore-path = .venv,.tox,.git,dist,doc,*egg-info,tools,etc,build,*.po,*.pot,inte
|
|||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
show-source = True
|
show-source = True
|
||||||
ignore = E129,E402,E731,F601,F821,H301,H404,H405,H501,W503,W504,W605
|
ignore = E402,E731,F601,F821,H301,H404,H405,H501,W503,W504,W605
|
||||||
enable-extensions = H203,H106
|
enable-extensions = H203,H106
|
||||||
import-order-style = pep8
|
import-order-style = pep8
|
||||||
builtins = _
|
builtins = _
|
||||||
|
@ -511,7 +511,7 @@ class Manager(periodic_task.PeriodicTasks):
|
|||||||
exposed)
|
exposed)
|
||||||
|
|
||||||
if (gl_def[self.GUEST_LOG_TYPE_LABEL] ==
|
if (gl_def[self.GUEST_LOG_TYPE_LABEL] ==
|
||||||
guest_log.LogType.USER):
|
guest_log.LogType.USER):
|
||||||
guestlog.enabled = self.is_log_enabled(log_name)
|
guestlog.enabled = self.is_log_enabled(log_name)
|
||||||
guestlog.status = (guest_log.LogStatus.Enabled
|
guestlog.status = (guest_log.LogStatus.Enabled
|
||||||
if guestlog.enabled
|
if guestlog.enabled
|
||||||
|
@ -286,7 +286,7 @@ class MySqlManager(manager.Manager):
|
|||||||
|
|
||||||
volume_stats = self.get_filesystem_stats(context, None)
|
volume_stats = self.get_filesystem_stats(context, None)
|
||||||
if (volume_stats.get('total', 0.0) <
|
if (volume_stats.get('total', 0.0) <
|
||||||
replica_info['dataset']['dataset_size']):
|
replica_info['dataset']['dataset_size']):
|
||||||
raise exception.InsufficientSpaceForReplica(
|
raise exception.InsufficientSpaceForReplica(
|
||||||
replica_info.update({
|
replica_info.update({
|
||||||
'slave_volume_size': volume_stats.get('total', 0.0)
|
'slave_volume_size': volume_stats.get('total', 0.0)
|
||||||
|
@ -558,7 +558,7 @@ class InstanceController(wsgi.Controller):
|
|||||||
|
|
||||||
name = body['instance'].get('name')
|
name = body['instance'].get('name')
|
||||||
if ((name and len(body['instance'].keys()) > 2) or
|
if ((name and len(body['instance'].keys()) > 2) or
|
||||||
(not name and len(body['instance'].keys()) >= 2)):
|
(not name and len(body['instance'].keys()) >= 2)):
|
||||||
raise exception.BadRequest("Only one attribute (except 'name') is "
|
raise exception.BadRequest("Only one attribute (except 'name') is "
|
||||||
"allowed to update.")
|
"allowed to update.")
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user