Merge pull request #35729 from cachedout/fix_docs_build

Remove docs mocks for msgpack and psutils

doc/_ext/shorturls.py

@@ -15,7 +15,7 @@ def write_urls_index(app, exc):
     inventory = os.path.join(app.builder.outdir, 'objects.inv')
     objects = sphinx.ext.intersphinx.fetch_inventory(app, DOCS_URL, inventory)
 
-    with open(os.path.join(app.builder.outdir, 'shorturls.json'), 'wb') as f:
+    with open(os.path.join(app.builder.outdir, 'shorturls.json'), 'w') as f:
         json.dump(objects, f)
 
 def setup(app):

doc/conf.py

@@ -56,7 +56,6 @@ MOCK_MODULES = [
     'Crypto.Signature',
     'Crypto.Signature.PKCS1_v1_5',
     'M2Crypto',
-    'msgpack',
     'yaml',
     'yaml.constructor',
     'yaml.nodes',
@@ -112,7 +111,6 @@ MOCK_MODULES = [
     'MySQLdb',
     'MySQLdb.cursors',
     'nagios_json',
-    'psutil',
     'pycassa',
     'pymongo',
     'rabbitmq_server',