From 87b5b5eec63babd2ecf3616a5f8465717ac3ee77 Mon Sep 17 00:00:00 2001
From: Zach Riggle <riggle@google.com>
Date: Wed, 28 Feb 2018 14:50:06 -0600
Subject: [PATCH] Fix tests relying on broken autocontrib version

---
 docs/requirements.txt        |  2 +-
 docs/source/conf.py          | 23 -----------------------
 pwnlib/internal/dochelper.py |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 24c7e981a..aca295f62 100755
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
 sphinxcontrib-napoleon
-sphinxcontrib-autoprogram==0.1.2
+sphinxcontrib-autoprogram==0.1.4
 isort
 paramiko>=1.15.2
 mako>=1.0.0
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 59546d05d..547fd2a53 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -24,29 +24,6 @@
 
 import pwnlib
 
-# -- WORK-AROUNDS FOR DEPRECATION ----------------------------------------------
-# Deprecated
-# 1.6b1
-# sphinx.util.compat.Directive class is now deprecated.
-# Please use instead docutils.parsers.rst.Directive
-#
-# Pwntools Note:
-#   Can't just "do the right thing" since we have dependencies that
-#   are also affected by this, specifically sphinxcontrib.autoprogram
-try:
-    import sphinx.util.compat
-except ImportError:
-    import sys
-    import types
-    import sphinx.util
-    import docutils.parsers.rst
-    class compat(types.ModuleType):
-        Directive = docutils.parsers.rst.Directive
-    sphinx.util.compat = compat('sphinx.util.compat')
-    sys.modules['sphinx.util.compat'] = sphinx.util.compat
-
-# -- General configuration -----------------------------------------------------
-
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
diff --git a/pwnlib/internal/dochelper.py b/pwnlib/internal/dochelper.py
index d0f5e09a2..388c31093 100644
--- a/pwnlib/internal/dochelper.py
+++ b/pwnlib/internal/dochelper.py
@@ -3,7 +3,7 @@
 
 from docutils import nodes
 from docutils import statemachine
-from sphinx.util.compat import Directive
+from docutils.parsers.rst import Directive
 
 try:
     from StringIO import StringIO