Update hacking version

Use latest release 1.1.0 and compatible changes w.r.t pep8

Change-Id: Ie5e5417a1d8481bb59d516a320bd7cc1dd89591e

2 files changed, 33 insertions, 33 deletions

diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py
index bc5df494e..12b323451 100644
--- a/ansible/action_plugins/merge_configs.py
+++ b/ansible/action_plugins/merge_configs.py
@@ -15,6 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import collections
+import inspect
+import os
+import shutil
+import tempfile
+
+from ansible import constants
+from ansible.plugins import action
+from six import StringIO
+
+from oslo_config import iniparser
+
+_ORPHAN_SECTION = 'TEMPORARY_ORPHAN_VARIABLE_SECTION'
+
 DOCUMENTATION = '''
 ---
 module: merge_configs
@@ -51,20 +65,6 @@ Merge multiple configs:
           - "/etc/mysql/my.cnf"
 '''
 
-import collections
-import inspect
-import os
-import shutil
-import tempfile
-
-from ansible import constants
-from ansible.plugins import action
-from six import StringIO
-
-from oslo_config import iniparser
-
-_ORPHAN_SECTION = 'TEMPORARY_ORPHAN_VARIABLE_SECTION'
-
 
 class OverrideConfigParser(iniparser.BaseParser):
 
diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py
index 17ccd64e5..75f49d506 100755
--- a/ansible/action_plugins/merge_yaml.py
+++ b/ansible/action_plugins/merge_yaml.py
@@ -15,6 +15,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import inspect
+import os
+import shutil
+import tempfile
+
+from yaml import dump
+from yaml import safe_load
+try:
+    from yaml import CDumper as Dumper  # noqa: F401
+    from yaml import CLoader as Loader  # noqa: F401
+except ImportError:
+    from yaml import Dumper  # noqa: F401
+    from yaml import Loader  # noqa: F401
+
+
+from ansible import constants
+from ansible.plugins import action
+import six
+
 DOCUMENTATION = '''
 ---
 module: merge_yaml
@@ -50,25 +69,6 @@ Merge multiple yaml files:
           - "/tmp/out.yml"
 '''
 
-import inspect
-import os
-import shutil
-import tempfile
-
-from yaml import dump
-from yaml import safe_load
-try:
-    from yaml import CDumper as Dumper  # noqa: F401
-    from yaml import CLoader as Loader  # noqa: F401
-except ImportError:
-    from yaml import Dumper  # noqa: F401
-    from yaml import Loader  # noqa: F401
-
-
-from ansible import constants
-from ansible.plugins import action
-import six
-
 
 class ActionModule(action.ActionBase):