Merge pull request #82 from tshepang/diff

docutils is no longer optional
avelino · Mar 29, 2013 · ce33de5 · ce33de5
2 parents 345691e + 498dd96
commit ce33de5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/README.rst b/README.rst
@@ -115,7 +115,7 @@ Compatibility
 
 + Markup:
 
-  - restructedText_ (you need install docutils by yourself)
+  - restructedText_
   - markdown_
 
 + Python:

diff --git a/docs/config.rst b/docs/config.rst
@@ -51,8 +51,7 @@ The default **python** format config file::
     reader = {
         "active": [
             "liquidluck.readers.markdown.MarkdownReader",
-            # uncomment to active rst reader.
-            # but you need to install docutils by yourself
+            # uncomment to activate rST reader
             # "liquidluck.readers.restructuredtext.RestructuredTextReader",
         ],
         "vars": {}

diff --git a/docs/write.rst b/docs/write.rst
@@ -44,7 +44,7 @@ An example in markdown::
     ````
 
 
-An example in reStructuredText (you need to install docutils by yourself)::
+An example in reStructuredText::
 
     Felix Felicis
     ================

diff --git a/liquidluck/readers/restructuredtext.py b/liquidluck/readers/restructuredtext.py
@@ -27,10 +27,7 @@ def hello():
 
 import logging
 from xml.dom import minidom
-try:
-    from docutils import nodes
-except ImportError:
-    logging.warn("You need install docutils library")
+from docutils import nodes
 from docutils.core import publish_parts
 from docutils.parsers.rst import directives, Directive
 from pygments.formatters import HtmlFormatter

diff --git a/liquidluck/tools/_settings.py b/liquidluck/tools/_settings.py
@@ -34,8 +34,7 @@
 reader = {
     "active": [
         "liquidluck.readers.markdown.MarkdownReader",
-        # uncomment to active rst reader.
-        # but you need to install docutils by yourself
+        # uncomment to activate rST reader
         # "liquidluck.readers.restructuredtext.RestructuredTextReader",
     ],
     "vars": {}

diff --git a/liquidluck/tools/_settings.yml b/liquidluck/tools/_settings.yml
@@ -32,8 +32,7 @@ author:
 reader:
     active:
         - liquidluck.readers.markdown.MarkdownReader
-        # uncomment to active rst reader.
-        # but you need to install docutils by yourself
+        # uncomment to activate rST reader
         #- liquidluck.readers.restructuredtext.RestructuredTextReader
     vars:
         # key: value