saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix pylint errors and sloppy inline comments

Browse source
This commit is contained in:
Weilu Jia 2015-05-15 14:59:14 -07:00
parent 64634b6349
commit 5470cf58db
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/utils/psutil_compat.py
View file

@ -16,7 +16,7 @@ from __future__ import absolute_import
import psutil
if psutil.version_info >= (2, 0):
from psutil import * #pylint: disable: wildcard-import
from psutil import * # pylint: disable=wildcard-import
else:
# Import hack to work around bugs in old psutil's
# Psuedo "from psutil import *"
@ -29,8 +29,8 @@ else:
pass
# Import functions not in __all__
from psutil import disk_partitions
from psutil import disk_usage
from psutil import disk_partitions # pylint: disable=unused-import
from psutil import disk_usage # pylint: disable=unused-import
# Alias new module functions
def boot_time():
@ -47,7 +47,7 @@ else:
if psutil.version_info < (1, 0, 1):
net_io_counters = psutil.network_io_counters()
class Process(psutil.Process): #pylint: disable: no-init
class Process(psutil.Process): # pylint: disable=no-init
# Reimplement overloaded getters/setters
def cpu_affinity(self, *args, **kwargs):
if args or kwargs: