Merge pull request #41961 from cachedout/py3_doc

Allow docs to be built under Python 3
This commit is contained in:
garethgreenaway 2017-06-27 14:11:53 -07:00 committed by GitHub
commit 82b1eb28ab

View file

@ -77,6 +77,7 @@ MOCK_MODULES = [
'yaml.nodes',
'yaml.parser',
'yaml.scanner',
'salt.utils.yamlloader',
'zmq',
'zmq.eventloop',
'zmq.eventloop.ioloop',
@ -125,6 +126,7 @@ MOCK_MODULES = [
'ClusterShell',
'ClusterShell.NodeSet',
'django',
'docker',
'libvirt',
'MySQLdb',
'MySQLdb.cursors',
@ -169,7 +171,7 @@ MOCK_MODULES = [
for mod_name in MOCK_MODULES:
if mod_name == 'psutil':
mock = Mock(mapping={'total': 0}) # Otherwise it will crash Sphinx
mock = Mock(mapping={'total': 0, 'version_info': (0, 6,0)}) # Otherwise it will crash Sphinx
else:
mock = Mock()
sys.modules[mod_name] = mock