diff options
-rwxr-xr-x[-rw-r--r--] | cloudinit/config/cc_disk_setup.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/unittests/test_datasource/test_azure.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/unittests/test_datasource/test_opennebula.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/unittests/test_handler/test_handler_seed_random.py | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/unittests/test_userdata.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/unittests/test_util.py | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index d274f81a..ade9c2ad 100644..100755 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -16,8 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from cloudinit import util from cloudinit.settings import PER_INSTANCE +from cloudinit import util import logging import shlex diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index 86e2ed8c..df7e52d0 100644..100755 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -2,8 +2,8 @@ from cloudinit import helpers from cloudinit.sources import DataSourceAzure from tests.unittests.helpers import populate_dir -import crypt import base64 +import crypt from mocker import MockerTestCase import os import yaml diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py index 45256a86..e1812a88 100644..100755 --- a/tests/unittests/test_datasource/test_opennebula.py +++ b/tests/unittests/test_datasource/test_opennebula.py @@ -1,5 +1,5 @@ -from cloudinit.sources import DataSourceOpenNebula as ds from cloudinit import helpers +from cloudinit.sources import DataSourceOpenNebula as ds from cloudinit import util from mocker import MockerTestCase from tests.unittests.helpers import populate_dir diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/test_handler/test_handler_seed_random.py index 1b0675bb..1c0d284c 100644..100755 --- a/tests/unittests/test_handler/test_handler_seed_random.py +++ b/tests/unittests/test_handler/test_handler_seed_random.py @@ -19,8 +19,9 @@ from cloudinit.config import cc_seed_random import base64 -import tempfile import gzip +import tempfile + from StringIO import StringIO diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py index b227616c..5ffe8f0a 100644..100755 --- a/tests/unittests/test_userdata.py +++ b/tests/unittests/test_userdata.py @@ -6,9 +6,9 @@ import gzip import logging import os +from email.mime.application import MIMEApplication from email.mime.base import MIMEBase from email.mime.multipart import MIMEMultipart -from email.mime.application import MIMEApplication from cloudinit import handlers from cloudinit import helpers as c_helpers diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py index 87415cb5..38ab0c96 100644..100755 --- a/tests/unittests/test_util.py +++ b/tests/unittests/test_util.py @@ -5,8 +5,8 @@ import stat import yaml from mocker import MockerTestCase -from unittest import TestCase from tests.unittests import helpers +from unittest import TestCase from cloudinit import importer from cloudinit import util |