Global mass refactor

* remove unnecessary vim comments
* use unittest.mock first, then mock
* consistent spaces
* ignore *.orig files
* pep8 & flake8 compliant

Change-Id: I48e8b5c13b8ea436a48180f526e97fa8da003b68

.gitignore

@@ -5,6 +5,7 @@
 *.pyc
 *.swo
 *.swp
+*.orig
 *.sqlite
 .autogenerated
 .coverage

cloudbaseinit/init.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/metadata/factory.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/metadata/services/configdrive.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -40,6 +38,7 @@
 
 
 class ConfigDriveService(baseopenstackservice.BaseOpenStackService):
+
     def __init__(self):
         super(ConfigDriveService, self).__init__()
         self._metadata_path = None

cloudbaseinit/metadata/services/httpservice.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/metadata/services/osconfigdrive/base.py

@@ -16,6 +16,7 @@
 
 
 class BaseConfigDriveManager(object):
+
     @abc.abstractmethod
     def get_config_drive_files(self, target_path, check_raw_hhd=True,
                                check_cdrom=True):

cloudbaseinit/metadata/services/osconfigdrive/windows.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/osutils/base.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/osutils/factory.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/osutils/posix.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -20,5 +18,6 @@
 
 
 class PosixUtil(base.BaseOSUtils):
+
     def reboot(self):
         os.system('reboot')

cloudbaseinit/plugins/base.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -19,6 +17,7 @@
 
 
 class BasePlugin(object):
+
     def get_name(self):
         return self.__class__.__name__
 

cloudbaseinit/plugins/constants.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/plugins/factory.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/plugins/windows/createuser.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -36,6 +34,7 @@
 
 
 class CreateUserPlugin(base.BasePlugin):
+
     def _get_password(self, osutils):
         # Generate a temporary random password to be replaced
         # by SetUserPasswordPlugin (starting from Grizzly)

cloudbaseinit/plugins/windows/extendvolumes.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -44,6 +42,7 @@
 
 
 class ExtendVolumesPlugin(base.BasePlugin):
+
     def _extend_volumes(self, pack, volume_idxs=None):
         enum = pack.QueryVolumes()
         while True:

cloudbaseinit/plugins/windows/licensing.py

@@ -33,6 +33,7 @@
 
 
 class WindowsLicensingPlugin(base.BasePlugin):
+
     def _run_slmgr(self, osutils, args):
         if osutils.check_sysnative_dir_exists():
             cscript_dir = osutils.get_sysnative_dir()

cloudbaseinit/plugins/windows/sethostname.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/plugins/windows/setuserpassword.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -24,6 +22,7 @@
 from cloudbaseinit.plugins import constants
 from cloudbaseinit.utils import crypt
 
+
 opts = [
     cfg.BoolOpt('inject_user_password', default=True, help='Set the password '
                 'provided in the configuration. If False or no password is '
@@ -38,6 +37,7 @@
 
 
 class SetUserPasswordPlugin(base.BasePlugin):
+
     def _encrypt_password(self, ssh_pub_key, password):
         cm = crypt.CryptManager()
         with cm.load_ssh_rsa_public_key(ssh_pub_key) as rsa:

cloudbaseinit/plugins/windows/sshpublickeys.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -29,6 +27,7 @@
 
 
 class SetUserSSHPublicKeysPlugin(base.BasePlugin):
+
     def execute(self, service, shared_data):
         public_keys = service.get_public_keys()
         if not public_keys:

cloudbaseinit/plugins/windows/userdata.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -25,6 +23,7 @@
 from cloudbaseinit.plugins.windows import userdatautils
 from cloudbaseinit.utils import encoding
 
+
 LOG = logging.getLogger(__name__)
 
 

cloudbaseinit/plugins/windows/userdataplugins/base.py

@@ -16,6 +16,7 @@
 
 
 class BaseUserDataPlugin(object):
+
     def __init__(self, mime_type):
         self._mime_type = mime_type
 

cloudbaseinit/plugins/windows/userdataplugins/cloudboothook.py

@@ -19,6 +19,7 @@
 
 
 class CloudBootHookPlugin(base.BaseUserDataPlugin):
+
     def __init__(self):
         super(CloudBootHookPlugin, self).__init__("text/cloud-boothook")
 

cloudbaseinit/plugins/windows/userdataplugins/multipartmixed.py

@@ -16,6 +16,7 @@
 
 
 class MultipartMixedPlugin(base.BaseUserDataPlugin):
+
     def __init__(self):
         super(MultipartMixedPlugin, self).__init__("multipart/mixed")
 

cloudbaseinit/plugins/windows/userdataplugins/parthandler.py

@@ -24,6 +24,7 @@
 
 
 class PartHandlerPlugin(base.BaseUserDataPlugin):
+
     def __init__(self):
         super(PartHandlerPlugin, self).__init__("text/part-handler")
 

cloudbaseinit/plugins/windows/userdataplugins/shellscript.py

@@ -25,6 +25,7 @@
 
 
 class ShellScriptPlugin(base.BaseUserDataPlugin):
+
     def __init__(self):
         super(ShellScriptPlugin, self).__init__("text/x-shellscript")
 

cloudbaseinit/plugins/windows/userdatautils.py

@@ -18,6 +18,7 @@
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.plugins.common import execcmd
 
+
 LOG = logging.getLogger(__name__)
 
 # Avoid 80+ length by using a local variable, which

cloudbaseinit/plugins/windows/winrmcertificateauth.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -23,10 +21,12 @@
 from cloudbaseinit.utils.windows import winrmconfig
 from cloudbaseinit.utils.windows import x509
 
+
 LOG = logging.getLogger(__name__)
 
 
 class ConfigWinRMCertificateAuthPlugin(base.BasePlugin):
+
     def _get_credentials(self, shared_data):
         user_name = shared_data.get(constants.SHARED_DATA_USERNAME)
         if not user_name:

cloudbaseinit/plugins/windows/winrmlistener.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -23,6 +21,7 @@
 from cloudbaseinit.utils.windows import winrmconfig
 from cloudbaseinit.utils.windows import x509
 
+
 LOG = logging.getLogger(__name__)
 
 opts = [

cloudbaseinit/shell.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/tests/__init__.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/tests/fake.py

@@ -14,6 +14,7 @@
 
 
 class FakeComError(Exception):
+
     def __init__(self):
         super(FakeComError, self).__init__()
         self.excepinfo = [None, None, None, None, None, -2144108544]

cloudbaseinit/tests/metadata/__init__.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/tests/metadata/services/__init__.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/tests/metadata/services/osconfigdrive/__init__.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2014 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2014 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,10 +12,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import sys
 import unittest
 
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
+
 from cloudbaseinit.metadata.services.osconfigdrive import factory
 
 

cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2014 Cloudbase Solutions Srl
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,10 +13,13 @@
 #    under the License.
 
 import importlib
-import mock
 import os
 import unittest
 
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 from oslo.config import cfg
 
 from cloudbaseinit import exception

cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py

@@ -17,7 +17,10 @@
 import posixpath
 import unittest
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 from oslo.config import cfg
 
 from cloudbaseinit.metadata.services import base

cloudbaseinit/tests/metadata/services/test_cloudstack.py

@@ -12,9 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import unittest
 
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 from oslo.config import cfg
 from six.moves import urllib