mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
boto_*: fix incorrect pylint exceptions
This commit is contained in:
parent
8fa76d7e40
commit
220c9338f3
@ -47,13 +47,13 @@ logging.getLogger('boto').setLevel(logging.INFO)
|
|||||||
import salt.ext.six as six
|
import salt.ext.six as six
|
||||||
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
|
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
|
||||||
try:
|
try:
|
||||||
#pylint: disable=import-error
|
#pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.dynamodb2
|
import boto.dynamodb2
|
||||||
|
#pylint: enable=unused-import
|
||||||
from boto.dynamodb2.fields import HashKey, RangeKey
|
from boto.dynamodb2.fields import HashKey, RangeKey
|
||||||
from boto.dynamodb2.fields import AllIndex, GlobalAllIndex
|
from boto.dynamodb2.fields import AllIndex, GlobalAllIndex
|
||||||
from boto.dynamodb2.table import Table
|
from boto.dynamodb2.table import Table
|
||||||
#pylint: enable=import-error
|
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
HAS_BOTO = False
|
HAS_BOTO = False
|
||||||
|
@ -49,10 +49,10 @@ from salt.exceptions import SaltInvocationError, CommandExecutionError
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
try:
|
try:
|
||||||
# pylint: disable=import-error
|
# pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.ec2
|
import boto.ec2
|
||||||
# pylint: enable=import-error
|
# pylint: enable=unused-import
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
HAS_BOTO = False
|
HAS_BOTO = False
|
||||||
|
@ -47,10 +47,10 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
try:
|
try:
|
||||||
# pylint: disable=import-error
|
# pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.elasticache
|
import boto.elasticache
|
||||||
# pylint: enable=import-error
|
# pylint: enable=unused-import
|
||||||
import boto.utils
|
import boto.utils
|
||||||
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
|
@ -40,7 +40,7 @@ import json
|
|||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
# pylint: disable=import-error
|
# pylint: disable=unused-import
|
||||||
from salt.ext.six import string_types
|
from salt.ext.six import string_types
|
||||||
from salt.ext.six.moves.urllib.parse import unquote as _unquote # pylint: disable=no-name-in-module
|
from salt.ext.six.moves.urllib.parse import unquote as _unquote # pylint: disable=no-name-in-module
|
||||||
try:
|
try:
|
||||||
@ -50,7 +50,7 @@ try:
|
|||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
HAS_BOTO = False
|
HAS_BOTO = False
|
||||||
# pylint: enable=import-error
|
# pylint: enable=unused-import
|
||||||
|
|
||||||
# Import salt libs
|
# Import salt libs
|
||||||
import salt.utils.odict as odict
|
import salt.utils.odict as odict
|
||||||
|
@ -46,10 +46,10 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
try:
|
try:
|
||||||
#pylint: disable=import-error
|
#pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.route53
|
import boto.route53
|
||||||
#pylint: enable=import-error
|
#pylint: enable=unused-import
|
||||||
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -48,10 +48,10 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
try:
|
try:
|
||||||
# pylint: disable=import-error
|
# pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.ec2
|
import boto.ec2
|
||||||
# pylint: enable=import-error
|
# pylint: enable=unused-import
|
||||||
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -42,10 +42,10 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
try:
|
try:
|
||||||
#pylint: disable=import-error
|
#pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.sns
|
import boto.sns
|
||||||
#pylint: enable=import-error
|
#pylint: enable=unused-import
|
||||||
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -47,10 +47,10 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
try:
|
try:
|
||||||
# pylint: disable=import-error
|
# pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.sqs
|
import boto.sqs
|
||||||
# pylint: enable=import-error
|
# pylint: enable=unused-import
|
||||||
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -50,12 +50,12 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Import third party libs
|
# Import third party libs
|
||||||
import salt.ext.six as six
|
import salt.ext.six as six
|
||||||
# pylint: disable=import-error
|
# pylint: disable=unused-import-error
|
||||||
try:
|
try:
|
||||||
#pylint: disable=import-error
|
#pylint: disable=unused-import
|
||||||
import boto
|
import boto
|
||||||
import boto.vpc
|
import boto.vpc
|
||||||
#pylint: enable=import-error
|
#pylint: enable=unused-import
|
||||||
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
logging.getLogger('boto').setLevel(logging.CRITICAL)
|
||||||
HAS_BOTO = True
|
HAS_BOTO = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
Loading…
Reference in New Issue
Block a user