Merge "Use six.moves for reloading a module"

proliantutils/tests/ipa_hw_manager/__init__.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import six
 import sys
 
 import mock
@@ -26,4 +27,4 @@ if not ironic_python_agent:
     ipa_mock.hardware.GenericHardwareManager = mock.MagicMock
     mock.MagicMock.erase_devices = mock.MagicMock(name='erase_devices')
     if 'proliantutils.ipa_hw_manager' in sys.modules:
-        reload(sys.modules['proliantutils.ipa_hw_manager'])
+        six.moves.reload_module('proliantutils.ipa_hw_manager')

tox.ini

@@ -13,7 +13,6 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python2.7
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -24,7 +23,6 @@ commands =
 # After running this target, visit proliantutils/cover/index.html
 # in your browser, to see a nicer presentation report with annotated
 # HTML listings detailing missed lines.
-basepython = python2.7
 setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US
          PYTHON=coverage run --source proliantutils --omit='*tests*' --parallel-mode