[Docutils-checkins] SF.net SVN: docutils:[7528] trunk/docutils

[<dku...@us...>]

Revision: 7528
          http://docutils.svn.sourceforge.net/docutils/?rev=7528&view=rev
Author:   dkuhlman
Date:     2012-10-13 20:52:15 +0000 (Sat, 13 Oct 2012)
Log Message:
-----------
Fix to config file access and added note on config in documentation

Modified Paths:
--------------
    trunk/docutils/docs/user/odt.txt
    trunk/docutils/docutils/writers/odf_odt/__init__.py

Modified: trunk/docutils/docs/user/odt.txt
===================================================================
--- trunk/docutils/docs/user/odt.txt	2012-10-12 12:21:18 UTC (rev 7527)
+++ trunk/docutils/docs/user/odt.txt	2012-10-13 20:52:15 UTC (rev 7528)
@@ -73,6 +73,21 @@
     $ rst2odt.py --source-url=odtwriter.txt --generator --stylesheet=/myconfigs/styles.odt odtwriter.txt odtwriter.odt
 
 
+Configuration file
+------------------
+
+The options described below can also be set in a configuration file.
+Use section ``[odf_odt writer]`` to set options specific to the
+``odtwriter``.  For example::
+
+    [odf_odt writer]
+    stylesheet: styles1.odt
+
+See the "Docutils Configuration" document for more information on
+Docutils configuration files, including locations which are
+searched.
+
+
 Command line options
 --------------------
 

Modified: trunk/docutils/docutils/writers/odf_odt/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/odf_odt/__init__.py	2012-10-12 12:21:18 UTC (rev 7527)
+++ trunk/docutils/docutils/writers/odf_odt/__init__.py	2012-10-13 20:52:15 UTC (rev 7528)
@@ -21,13 +21,10 @@
 import time
 import re
 import StringIO
-import inspect
-import imp
 import copy
 import urllib2
 import docutils
 from docutils import frontend, nodes, utils, writers, languages
-from docutils.parsers import rst
 from docutils.readers import standalone
 from docutils.transforms import references
 
@@ -64,7 +61,8 @@
 except ImportError, exp:
     pygments = None
 
-try: # check for the Python Imaging Library
+# check for the Python Imaging Library
+try:
     import PIL.Image
 except ImportError:
     try:  # sometimes PIL modules are put in PYTHONPATH's root
@@ -136,7 +134,7 @@
     'oooc': 'http://openoffice.org/2004/calc',
     'ooow': 'http://openoffice.org/2004/writer',
     'presentation': 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0',
-    
+
     'script': 'urn:oasis:names:tc:opendocument:xmlns:script:1.0',
     'style': 'urn:oasis:names:tc:opendocument:xmlns:style:1.0',
     'svg': 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0',
@@ -534,7 +532,7 @@
         'stylesheet_path',
         )
 
-    config_section = 'opendocument odf writer'
+    config_section = 'odf_odt writer'
     config_section_dependencies = (
         'writers',
         )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.