summaryrefslogtreecommitdiff
path: root/sphinx/directives/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'sphinx/directives/__init__.py')
-rw-r--r--sphinx/directives/__init__.py26
1 files changed, 17 insertions, 9 deletions
diff --git a/sphinx/directives/__init__.py b/sphinx/directives/__init__.py
index 52965c0e2..76b54f9d6 100644
--- a/sphinx/directives/__init__.py
+++ b/sphinx/directives/__init__.py
@@ -17,10 +17,17 @@ from docutils.parsers.rst import Directive, directives, roles
from sphinx import addnodes
from sphinx.util.docfields import DocFieldTransformer
-# import and register directives
-from sphinx.directives.code import * # noqa
-from sphinx.directives.other import * # noqa
-from sphinx.directives.patches import * # noqa
+# import all directives sphinx provides
+from sphinx.directives.code import ( # noqa
+ Highlight, CodeBlock, LiteralInclude
+)
+from sphinx.directives.other import ( # noqa
+ TocTree, Author, Index, VersionChange, SeeAlso,
+ TabularColumns, Centered, Acks, HList, Only, Include, Class
+)
+from sphinx.directives.patches import ( # noqa
+ Figure, Meta
+)
# RE to strip backslash escapes
@@ -217,8 +224,9 @@ class DefaultDomain(Directive):
return []
-directives.register_directive('default-role', DefaultRole)
-directives.register_directive('default-domain', DefaultDomain)
-directives.register_directive('describe', ObjectDescription)
-# new, more consistent, name
-directives.register_directive('object', ObjectDescription)
+def setup(app):
+ directives.register_directive('default-role', DefaultRole)
+ directives.register_directive('default-domain', DefaultDomain)
+ directives.register_directive('describe', ObjectDescription)
+ # new, more consistent, name
+ directives.register_directive('object', ObjectDescription)