From ce01b41d81584ff2d4a7634a5982c133b3e781ef Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 6 Nov 2020 19:36:36 -0500 Subject: [PATCH] Lint: E711 comparison to None should be 'if cond is None:' --- client-cli/pvc.py | 6 +++--- node-daemon/pvcnoded/Daemon.py | 2 +- node-daemon/pvcnoded/VMInstance.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client-cli/pvc.py b/client-cli/pvc.py index 389d1e73..c5ba85a1 100755 --- a/client-cli/pvc.py +++ b/client-cli/pvc.py @@ -682,7 +682,7 @@ def vm_modify(domain, cfgfile, editor, restart): Modify existing virtual machine DOMAIN, either in-editor or with replacement CONFIG. DOMAIN may be a UUID or name. """ - if editor is False and cfgfile == None: + if editor is False and cfgfile is None: cleanup(False, 'Either an XML config file or the "--editor" option must be specified.') retcode, vm_information = pvc_vm.vm_info(config, domain) @@ -2894,7 +2894,7 @@ def provisioner_userdata_modify(name, filename, editor): Modify existing userdata document NAME, either in-editor or with replacement FILE. """ - if editor is False and filename == None: + if editor is False and filename is None: cleanup(False, 'Either a file or the "--editor" option must be specified.') if editor is True: @@ -3073,7 +3073,7 @@ def provisioner_script_modify(name, filename, editor): Modify existing script NAME, either in-editor or with replacement FILE. """ - if editor is False and filename == None: + if editor is False and filename is None: cleanup(False, 'Either a file or the "--editor" option must be specified.') if editor is True: diff --git a/node-daemon/pvcnoded/Daemon.py b/node-daemon/pvcnoded/Daemon.py index 6917b50b..e9905f64 100644 --- a/node-daemon/pvcnoded/Daemon.py +++ b/node-daemon/pvcnoded/Daemon.py @@ -1318,7 +1318,7 @@ def collect_vm_stats(queue): if debug: logger.out("Connecting to libvirt", state='d', prefix='vm-thread') lv_conn = libvirt.open(libvirt_name) - if lv_conn == None: + if lv_conn is None: logger.out('Failed to open connection to "{}"'.format(libvirt_name), state='e') return diff --git a/node-daemon/pvcnoded/VMInstance.py b/node-daemon/pvcnoded/VMInstance.py index cf6f7fd9..18af77a6 100644 --- a/node-daemon/pvcnoded/VMInstance.py +++ b/node-daemon/pvcnoded/VMInstance.py @@ -210,7 +210,7 @@ class VMInstance(object): # Start up a new Libvirt connection libvirt_name = "qemu:///system" lv_conn = libvirt.open(libvirt_name) - if lv_conn == None: + if lv_conn is None: self.logger.out('Failed to open local libvirt connection', state='e', prefix='Domain {}'.format(self.domuuid)) self.instart = False return @@ -254,7 +254,7 @@ class VMInstance(object): # Start up a new Libvirt connection libvirt_name = "qemu:///system" lv_conn = libvirt.open(libvirt_name) - if lv_conn == None: + if lv_conn is None: self.logger.out('Failed to open local libvirt connection', state='e', prefix='Domain {}'.format(self.domuuid)) self.inrestart = False return @@ -752,7 +752,7 @@ class VMInstance(object): try: # Open a libvirt connection lv_conn = libvirt.open(libvirt_name) - if lv_conn == None: + if lv_conn is None: self.logger.out('Failed to open local libvirt connection', state='e', prefix='Domain {}'.format(self.domuuid)) return None