valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pylint fixes

Browse Source
This commit is contained in:
rallytime 2016-06-28 16:04:47 -06:00
parent f9ab8ba46d
commit 359e8ca2ce
12 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/inspectlib/__init__.py
View File

@ -14,7 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Import Python libs
from __future__ import absolute_import
import os
# Import Salt libs
from salt.modules.inspectlib.exceptions import InspectorSnapshotException
from salt.modules.inspectlib.dbhandle import DBHandle

1
salt/states/file.py
View File

@ -4405,6 +4405,7 @@ def accumulated(name, filename, text, **kwargs):
_persist_accummulators(accum_data, accum_deps)
return ret
def serialize(name,
dataset=None,
dataset_pillar=None,

11
tests/unit/modules/boto_cloudtrail_test.py
View File

@ -8,7 +8,12 @@ import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -17,13 +22,11 @@ ensure_in_syspath('../../')
import salt.config
import salt.loader
from salt.modules import boto_cloudtrail
from salt.ext.six.moves import range
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# pylint: disable=import-error,no-name-in-module,unused-import
try:
import boto

11
tests/unit/modules/boto_iot_test.py
View File

@ -8,7 +8,12 @@ import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -17,13 +22,11 @@ ensure_in_syspath('../../')
import salt.config
import salt.loader
from salt.modules import boto_iot
from salt.ext.six.moves import range
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# pylint: disable=import-error,no-name-in-module,unused-import
try:
import boto

11
tests/unit/modules/boto_lambda_test.py
View File

@ -9,7 +9,12 @@ import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -19,15 +24,13 @@ import salt.config
import salt.loader
from salt.modules import boto_lambda
from salt.exceptions import SaltInvocationError
from salt.ext.six.moves import range
# Import 3rd-party libs
from tempfile import NamedTemporaryFile
import logging
import os
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# pylint: disable=import-error,no-name-in-module
try:
import boto3

11
tests/unit/modules/boto_s3_bucket_test.py
View File

@ -9,7 +9,12 @@ import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -18,13 +23,11 @@ ensure_in_syspath('../../')
import salt.config
import salt.loader
from salt.modules import boto_s3_bucket
from salt.ext.six.moves import range
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# pylint: disable=import-error,no-name-in-module,unused-import
try:
import boto

1
tests/unit/modules/boto_vpc_test.py
View File

@ -24,6 +24,7 @@ import salt.loader
from salt.modules import boto_vpc
from salt.exceptions import SaltInvocationError, CommandExecutionError
from salt.modules.boto_vpc import _maybe_set_name_tag, _maybe_set_tags
from salt.ext.six.moves import range
# Import 3rd-party libs
import salt.ext.six as six

11
tests/unit/states/boto_cloudtrail_test.py
View File

@ -8,7 +8,12 @@ import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -16,13 +21,11 @@ ensure_in_syspath('../../')
# Import Salt libs
import salt.config
import salt.loader
from salt.ext.six.moves import range
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
# pylint: disable=import-error,no-name-in-module,unused-import
from unit.modules.boto_cloudtrail_test import BotoCloudTrailTestCaseMixin

15
tests/unit/states/boto_iot_test.py
View File

@ -3,12 +3,18 @@
# Import Python libs
from __future__ import absolute_import
from distutils.version import LooseVersion # pylint: disable=import-error,no-name-in-module
import logging
import random
import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -16,12 +22,7 @@ ensure_in_syspath('../../')
# Import Salt libs
import salt.config
import salt.loader
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from salt.ext.six.moves import range
# pylint: disable=import-error,no-name-in-module,unused-import
from unit.modules.boto_iot_test import BotoIoTTestCaseMixin

15
tests/unit/states/boto_lambda_test.py
View File

@ -4,12 +4,18 @@
from __future__ import absolute_import
from distutils.version import LooseVersion # pylint: disable=import-error,no-name-in-module
import json
import logging
import random
import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -17,12 +23,7 @@ ensure_in_syspath('../../')
# Import Salt libs
import salt.config
import salt.loader
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from salt.ext.six.moves import range
# pylint: disable=import-error,no-name-in-module
from unit.modules.boto_lambda_test import BotoLambdaTestCaseMixin, TempZipFile

15
tests/unit/states/boto_s3_bucket_test.py
View File

@ -4,12 +4,18 @@
from __future__ import absolute_import
from distutils.version import LooseVersion # pylint: disable=import-error,no-name-in-module
from copy import deepcopy
import logging
import random
import string
# Import Salt Testing libs
from salttesting.unit import skipIf, TestCase
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
)
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
@ -17,12 +23,7 @@ ensure_in_syspath('../../')
# Import Salt libs
import salt.config
import salt.loader
# Import 3rd-party libs
import logging
# Import Mock libraries
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from salt.ext.six.moves import range
# pylint: disable=import-error,no-name-in-module,unused-import
from unit.modules.boto_s3_bucket_test import BotoS3BucketTestCaseMixin

1
tests/unit/states/boto_vpc_test.py
View File

@ -17,6 +17,7 @@ ensure_in_syspath('../../')
# Import Salt libs
import salt.config
import salt.loader
from salt.ext.six.moves import range
# pylint: disable=import-error
from unit.modules.boto_vpc_test import BotoVpcTestCaseMixin