mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
PyLint's disable-msg
is deprecated. Use disable
.
This commit is contained in:
parent
74c8011bd0
commit
7f1e6ceb50
@ -52,7 +52,7 @@ import logging
|
||||
# Import salt.cloud libs
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.utils import namespaced_function
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.exceptions import SaltCloudException, SaltCloudSystemExit
|
||||
|
||||
# Import libcloudfuncs and libcloud_aws, required to latter patch __opts__
|
||||
@ -61,7 +61,7 @@ from salt.cloud.clouds import libcloud_aws
|
||||
# Import libcloud_aws, storing pre and post locals so we can namespace any
|
||||
# callable to this module.
|
||||
PRE_IMPORT_LOCALS_KEYS = locals().copy()
|
||||
from salt.cloud.clouds.libcloud_aws import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.clouds.libcloud_aws import * # pylint: disable=W0614,W0401
|
||||
POST_IMPORT_LOCALS_KEYS = locals().copy()
|
||||
|
||||
# Get logging started
|
||||
|
@ -28,7 +28,7 @@ import logging
|
||||
|
||||
# Import salt cloud libs
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.utils import namespaced_function
|
||||
from salt.cloud.exceptions import SaltCloudSystemExit
|
||||
|
||||
|
@ -88,7 +88,7 @@ from salt._compat import ElementTree as ET
|
||||
# Import salt.cloud libs
|
||||
import salt.cloud.utils
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.exceptions import (
|
||||
SaltCloudException,
|
||||
SaltCloudSystemExit,
|
||||
|
@ -43,7 +43,7 @@ import pprint
|
||||
import logging
|
||||
|
||||
# Import generic libcloud functions
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
|
||||
# Import salt cloud libs
|
||||
import salt.cloud.config as config
|
||||
|
@ -54,7 +54,7 @@ import logging
|
||||
from libcloud.compute.base import NodeAuthSSHKey
|
||||
|
||||
# Import generic libcloud functions
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
|
||||
# Import salt.cloud libs
|
||||
import salt.cloud.config as config
|
||||
|
@ -61,7 +61,7 @@ import inspect
|
||||
import yaml
|
||||
|
||||
# Import generic libcloud functions
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
|
||||
# Import salt.cloud libs
|
||||
import salt.cloud.utils
|
||||
|
@ -56,7 +56,7 @@ import logging
|
||||
import salt.cloud.utils
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.utils import namespaced_function
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import destroy as libcloudfuncs_destroy
|
||||
from salt.cloud.exceptions import (
|
||||
SaltCloudException,
|
||||
|
@ -38,7 +38,7 @@ from libcloud.compute.base import NodeAuthPassword
|
||||
|
||||
# Import salt cloud libs
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.utils import namespaced_function
|
||||
|
||||
|
||||
|
@ -90,7 +90,7 @@ except Exception:
|
||||
pass
|
||||
|
||||
# Import generic libcloud functions
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
|
||||
# Import nova libs
|
||||
HASNOVA = False
|
||||
|
@ -140,7 +140,7 @@ except Exception:
|
||||
pass
|
||||
|
||||
# Import generic libcloud functions
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
|
||||
# Import salt libs
|
||||
import salt.utils
|
||||
|
@ -49,7 +49,7 @@ import pprint
|
||||
from libcloud.compute.base import NodeState
|
||||
|
||||
# Import generic libcloud functions
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
|
||||
# Import salt libs
|
||||
import salt.utils
|
||||
|
@ -31,7 +31,7 @@ import time
|
||||
# Import salt cloud libs
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.exceptions import SaltCloudSystemExit
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.utils import namespaced_function
|
||||
|
||||
# Attempt to import softlayer lib
|
||||
|
@ -31,7 +31,7 @@ import time
|
||||
# Import salt cloud libs
|
||||
import salt.cloud.config as config
|
||||
from salt.cloud.exceptions import SaltCloudSystemExit
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable-msg=W0614,W0401
|
||||
from salt.cloud.libcloudfuncs import * # pylint: disable=W0614,W0401
|
||||
from salt.cloud.utils import namespaced_function
|
||||
|
||||
# Attempt to import softlayer lib
|
||||
|
@ -9,7 +9,7 @@ import os
|
||||
import logging
|
||||
|
||||
|
||||
# pylint: disable-msg=W0611
|
||||
# pylint: disable=W0611
|
||||
# Import libcloud
|
||||
from libcloud.compute.types import Provider
|
||||
from libcloud.compute.providers import get_driver
|
||||
@ -97,7 +97,7 @@ def avail_locations(conn=None):
|
||||
relevant data
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
locations = conn.list_locations()
|
||||
ret = {}
|
||||
@ -128,7 +128,7 @@ def avail_images(conn=None):
|
||||
relevant data
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
images = conn.list_images()
|
||||
ret = {}
|
||||
@ -157,7 +157,7 @@ def avail_sizes(conn=None):
|
||||
relevant data
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
sizes = conn.list_sizes()
|
||||
ret = {}
|
||||
@ -289,7 +289,7 @@ def destroy(name, conn=None):
|
||||
)
|
||||
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
node = get_node(conn, name)
|
||||
if node is None:
|
||||
@ -319,7 +319,7 @@ def reboot(name, conn=None):
|
||||
Reboot a single VM
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
node = get_node(conn, name)
|
||||
if node is None:
|
||||
@ -351,7 +351,7 @@ def list_nodes(conn=None):
|
||||
Return a list of the VMs that are on the provider
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
nodes = conn.list_nodes()
|
||||
ret = {}
|
||||
@ -373,7 +373,7 @@ def list_nodes_full(conn=None):
|
||||
Return a list of the VMs that are on the provider, with all fields
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
nodes = conn.list_nodes()
|
||||
ret = {}
|
||||
@ -390,7 +390,7 @@ def list_nodes_select(conn=None):
|
||||
Return a list of the VMs that are on the provider, with select fields
|
||||
'''
|
||||
if not conn:
|
||||
conn = get_conn() # pylint: disable-msg=E0602
|
||||
conn = get_conn() # pylint: disable=E0602
|
||||
|
||||
nodes = conn.list_nodes()
|
||||
ret = {}
|
||||
|
Loading…
Reference in New Issue
Block a user