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, 16 insertions, 23 deletions

diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index 99fab315..aaea43cc 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -5,36 +5,29 @@ import alabaster
 
 # Alabaster theme + mini-extension
 html_theme_path = [alabaster.get_path()]
-extensions = ['alabaster', 'sphinx.ext.intersphinx']
+extensions = ["alabaster", "sphinx.ext.intersphinx"]
 # Paths relative to invoking conf.py - not this shared file
-html_theme = 'alabaster'
+html_theme = "alabaster"
 html_theme_options = {
-    'description': "A Python implementation of SSHv2.",
-    'github_user': 'paramiko',
-    'github_repo': 'paramiko',
-    'analytics_id': 'UA-18486793-2',
-    'travis_button': True,
+    "description": "A Python implementation of SSHv2.",
+    "github_user": "paramiko",
+    "github_repo": "paramiko",
+    "analytics_id": "UA-18486793-2",
+    "travis_button": True,
 }
 html_sidebars = {
-    '**': [
-        'about.html',
-        'navigation.html',
-        'searchbox.html',
-        'donate.html',
-    ]
+    "**": ["about.html", "navigation.html", "searchbox.html", "donate.html"]
 }
 
 # Everything intersphinx's to Python
-intersphinx_mapping = {
-    'python': ('http://docs.python.org/2.6', None),
-}
+intersphinx_mapping = {"python": ("http://docs.python.org/2.6", None)}
 
 # Regular settings
-project = 'Paramiko'
+project = "Paramiko"
 year = datetime.now().year
-copyright = '%d Jeff Forcier' % year
-master_doc = 'index'
-templates_path = ['_templates']
-exclude_trees = ['_build']
-source_suffix = '.rst'
-default_role = 'obj'
+copyright = "%d Jeff Forcier" % year
+master_doc = "index"
+templates_path = ["_templates"]
+exclude_trees = ["_build"]
+source_suffix = ".rst"
+default_role = "obj"