From 0d6535242db07968206b3af15046f62a30748449 Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho <rhcarvalho@gmail.com>
Date: Mon, 20 Feb 2017 17:36:36 +0100
Subject: Fix validation of generated code

Importing modules with the same name will not reload an already imported
module. Explicitly reloading the module is the quickest fix.
---
 roles/lib_utils/src/class/repoquery.py | 2 +-
 setup.py                               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/lib_utils/src/class/repoquery.py b/roles/lib_utils/src/class/repoquery.py
index 2447719e2..82adcada5 100644
--- a/roles/lib_utils/src/class/repoquery.py
+++ b/roles/lib_utils/src/class/repoquery.py
@@ -60,7 +60,7 @@ class Repoquery(RepoqueryCLI):
         ''' Gather and present the versions of each package '''
 
         versions_dict = {}
-        versions_dict['available_versions_full'] = formatted_versions.keys()
+        versions_dict['available_versions_full'] = list(formatted_versions.keys())
 
         # set the match version, if called
         if self.match_version:
diff --git a/setup.py b/setup.py
index 372aca9ff..2ad26110b 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ import yaml
 from setuptools import setup, Command
 from setuptools_lint.setuptools_command import PylintCommand
 from six import string_types
+from six.moves import reload_module
 from yamllint.config import YamlLintConfig
 from yamllint.cli import Format
 from yamllint import linter
@@ -185,6 +186,7 @@ class OpenShiftAnsibleGenerateValidation(Command):
                 # the python path.
                 # pylint: disable=import-error
                 import generate
+                reload_module(generate)
                 generate.verify()
             except generate.GenerateAnsibleException as gae:
                 print(gae.args)
-- 
cgit v1.2.3