From 6ebad94f38ae4de1eb3acf6f6544f0072c2bf0df Mon Sep 17 00:00:00 2001
From: Robert Tingirica <rtingirica@cloudbasesolutions.com>
Date: Wed, 10 Sep 2014 12:35:18 +0300
Subject: [PATCH] Fixed various pep8 errors

---
 cloudbaseinit/tests/metadata/services/test_httpservice.py | 2 +-
 cloudbaseinit/tests/osutils/test_windows.py               | 3 +--
 cloudbaseinit/tests/plugins/windows/test_userdatautils.py | 1 -
 cloudbaseinit/tests/utils/test_dhcp.py                    | 5 +----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cloudbaseinit/tests/metadata/services/test_httpservice.py b/cloudbaseinit/tests/metadata/services/test_httpservice.py
index 4720ca69..c99c3e02 100644
--- a/cloudbaseinit/tests/metadata/services/test_httpservice.py
+++ b/cloudbaseinit/tests/metadata/services/test_httpservice.py
@@ -21,8 +21,8 @@ import unittest
 from oslo.config import cfg
 from six.moves.urllib import error
 
-from cloudbaseinit.metadata.services import httpservice
 from cloudbaseinit.metadata.services import base
+from cloudbaseinit.metadata.services import httpservice
 
 CONF = cfg.CONF
 
diff --git a/cloudbaseinit/tests/osutils/test_windows.py b/cloudbaseinit/tests/osutils/test_windows.py
index 50767ce6..1e5a610e 100644
--- a/cloudbaseinit/tests/osutils/test_windows.py
+++ b/cloudbaseinit/tests/osutils/test_windows.py
@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ctypes
 import importlib
 import mock
 import os
@@ -27,7 +26,7 @@ CONF = cfg.CONF
 
 
 class WindowsUtilsTest(unittest.TestCase):
-    '''Tests for the windows utils class'''
+    '''Tests for the windows utils class.'''
 
     _CONFIG_NAME = 'FakeConfig'
     _DESTINATION = '192.168.192.168'
diff --git a/cloudbaseinit/tests/plugins/windows/test_userdatautils.py b/cloudbaseinit/tests/plugins/windows/test_userdatautils.py
index a97d4cc4..b782d0d5 100644
--- a/cloudbaseinit/tests/plugins/windows/test_userdatautils.py
+++ b/cloudbaseinit/tests/plugins/windows/test_userdatautils.py
@@ -14,7 +14,6 @@
 
 import mock
 import os
-import uuid
 import unittest
 
 from oslo.config import cfg
diff --git a/cloudbaseinit/tests/utils/test_dhcp.py b/cloudbaseinit/tests/utils/test_dhcp.py
index b55db3ca..ee25579a 100644
--- a/cloudbaseinit/tests/utils/test_dhcp.py
+++ b/cloudbaseinit/tests/utils/test_dhcp.py
@@ -14,14 +14,11 @@
 
 import mock
 import netifaces
-import struct
 import socket
+import struct
 import unittest
 
 from cloudbaseinit.utils import dhcp
-from oslo.config import cfg
-
-CONF = cfg.CONF
 
 
 class DHCPUtilsTests(unittest.TestCase):