parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Lint: E711 comparison to None should be 'if cond is not None:'

This commit is contained in:
Joshua Boniface 2020-11-06 19:37:13 -05:00
parent ce01b41d81
commit 57c51d3234
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client-cli/pvc.py
View File

@ -710,11 +710,11 @@ def vm_modify(domain, cfgfile, editor, restart):
click.echo('')
diff = list(difflib.unified_diff(current_vm_cfgfile.split('\n'), new_vm_cfgfile.split('\n'), fromfile='current', tofile='modified', fromfiledate='', tofiledate='', n=3, lineterm=''))
for line in diff:
if re.match('^\+', line) != None:
if re.match('^\+', line) is not None:
click.echo(colorama.Fore.GREEN + line + colorama.Fore.RESET)
elif re.match('^\-', line) != None:
elif re.match('^\-', line) is not None:
click.echo(colorama.Fore.RED + line + colorama.Fore.RESET)
elif re.match('^[^]', line) != None:
elif re.match('^[^]', line) is not None:
click.echo(colorama.Fore.BLUE + line + colorama.Fore.RESET)
else:
click.echo(line)
@ -2917,11 +2917,11 @@ def provisioner_userdata_modify(name, filename, editor):
click.echo('')
diff = list(difflib.unified_diff(current_userdata.split('\n'), new_userdata.split('\n'), fromfile='current', tofile='modified', fromfiledate='', tofiledate='', n=3, lineterm=''))
for line in diff:
if re.match('^\+', line) != None:
if re.match('^\+', line) is not None:
click.echo(colorama.Fore.GREEN + line + colorama.Fore.RESET)
elif re.match('^\-', line) != None:
elif re.match('^\-', line) is not None:
click.echo(colorama.Fore.RED + line + colorama.Fore.RESET)
elif re.match('^[^]', line) != None:
elif re.match('^[^]', line) is not None:
click.echo(colorama.Fore.BLUE + line + colorama.Fore.RESET)
else:
click.echo(line)
@ -3096,11 +3096,11 @@ def provisioner_script_modify(name, filename, editor):
click.echo('')
diff = list(difflib.unified_diff(current_script.split('\n'), new_script.split('\n'), fromfile='current', tofile='modified', fromfiledate='', tofiledate='', n=3, lineterm=''))
for line in diff:
if re.match('^\+', line) != None:
if re.match('^\+', line) is not None:
click.echo(colorama.Fore.GREEN + line + colorama.Fore.RESET)
elif re.match('^\-', line) != None:
elif re.match('^\-', line) is not None:
click.echo(colorama.Fore.RED + line + colorama.Fore.RESET)
elif re.match('^[^]', line) != None:
elif re.match('^[^]', line) is not None:
click.echo(colorama.Fore.BLUE + line + colorama.Fore.RESET)
else:
click.echo(line)

2
node-daemon/pvcnoded/Daemon.py
View File

@ -1337,7 +1337,7 @@ def collect_vm_stats(queue):
memprov += instance.getmemory()
vcpualloc += instance.getvcpus()
if instance.getstate() == 'start' and instance.getnode() == this_node.name:
if instance.getdom() != None:
if instance.getdom() is not None:
try:
if instance.getdom().state()[0] != libvirt.VIR_DOMAIN_RUNNING:
raise

4
node-daemon/pvcnoded/VMInstance.py
View File

@ -638,7 +638,7 @@ class VMInstance(object):
# Check the current state of the VM
try:
if self.dom != None:
if self.dom is not None:
running, reason = self.dom.state()
else:
raise
@ -766,7 +766,7 @@ class VMInstance(object):
# After everything
finally:
# Close the libvirt connection
if lv_conn != None:
if lv_conn is not None:
lv_conn.close()
# Return the dom object (or None)