From 3d0b924e70d9e17a9ce928417b507d221c5f7a7f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 29 Mar 2013 12:28:38 +0100
Subject: [PATCH] remove xfileref_role() and directive_dwim() which were
 deprecated in 1.0

---
 CHANGES               |  6 +++++-
 sphinx/roles.py       |  8 --------
 sphinx/util/compat.py | 10 ----------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/CHANGES b/CHANGES
index aa5e5ef39..e9a401f9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,11 @@
 Release 1.2 (in development)
 ============================
 
-There should be no backwards-incompatible changes in this version.
+Incompatible changes
+--------------------
+
+* Removed ``sphinx.util.compat.directive_dwim()`` and
+  ``sphinx.roles.xfileref_role()`` which were deprecated since version 1.0.
 
 Features added
 --------------
diff --git a/sphinx/roles.py b/sphinx/roles.py
index 02c5ad8fc..6703b6b8b 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -10,7 +10,6 @@
 """
 
 import re
-import warnings
 
 from docutils import nodes, utils
 from docutils.parsers.rst import roles
@@ -316,10 +315,3 @@ specific_docroles = {
 
 for rolename, func in specific_docroles.iteritems():
     roles.register_local_role(rolename, func)
-
-
-# backwards compatibility alias
-def xfileref_role(*args, **kwds):
-    warnings.warn('xfileref_role is deprecated, use XRefRole',
-                  DeprecationWarning, stacklevel=2)
-    return XRefRole()(*args, **kwds)
diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index 916f6fa3b..946230799 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -33,14 +33,4 @@ def make_admonition(node_class, name, arguments, options, content, lineno,
     state.nested_parse(content, content_offset, admonition_node)
     return [admonition_node]
 
-
-# backwards-compatibility aliases for helpers in older Sphinx versions that
-# supported the docutils 0.4 directive function interface
-
 from docutils.parsers.rst import Directive
-
-def directive_dwim(obj):
-    import warnings
-    warnings.warn('directive_dwim is deprecated and no longer needed',
-                  DeprecationWarning, stacklevel=2)
-    return obj