Merge branch '2.1' into 2.2

Foregoes a handful of unblackened bits to make the merge easier; will
blacken next anyways

1 files changed, 8 insertions, 8 deletions

diff --git a/sites/www/conf.py b/sites/www/conf.py
index c7ba0a86..00944871 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -3,22 +3,22 @@ import sys
 import os
 from os.path import abspath, join, dirname
 
-sys.path.append(abspath(join(dirname(__file__), '..')))
+sys.path.append(abspath(join(dirname(__file__), "..")))
 from shared_conf import *
 
 # Releases changelog extension
-extensions.append('releases')
+extensions.append("releases")
 releases_release_uri = "https://github.com/paramiko/paramiko/tree/%s"
 releases_issue_uri = "https://github.com/paramiko/paramiko/issues/%s"
 
 # Default is 'local' building, but reference the public docs site when building
 # under RTD.
-target = join(dirname(__file__), '..', 'docs', '_build')
-if os.environ.get('READTHEDOCS') == 'True':
-    target = 'http://docs.paramiko.org/en/latest/'
-intersphinx_mapping['docs'] = (target, None)
+target = join(dirname(__file__), "..", "docs", "_build")
+if os.environ.get("READTHEDOCS") == "True":
+    target = "http://docs.paramiko.org/en/latest/"
+intersphinx_mapping["docs"] = (target, None)
 
 # Sister-site links to API docs
-html_theme_options['extra_nav_links'] = {
-    "API Docs": 'http://docs.paramiko.org',
+html_theme_options["extra_nav_links"] = {
+    "API Docs": "http://docs.paramiko.org"
 }