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

[<mi...@us...>]

Revision: 7795
          http://sourceforge.net/p/docutils/code/7795
Author:   milde
Date:     2015-02-19 17:08:20 +0000 (Thu, 19 Feb 2015)
Log Message:
-----------
Apply patch [ 119 ] by Anatoly Techtonik

use absolute paths for ``default_stylesheet_path`` 
and ``default_template_path``.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/docutils/writers/latex2e/__init__.py

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2015-02-19 11:24:52 UTC (rev 7794)
+++ trunk/docutils/HISTORY.txt	2015-02-19 17:08:20 UTC (rev 7795)
@@ -36,7 +36,13 @@
 * docutils/writers/html4css1/__init__.py 
 
   - Add "docutils" to class values for "container" object to address [ 267 ].
+  - Apply patch [ 119 ] by Anatoly Techtonik: use absolute paths for
+    ``default_stylesheet_path`` and ``default_template_path``.
 
+* docutils/writers/latex2e/__init__.py 
+
+  - use absolute path for ``default_template_path``.
+
 * docutils/writers/odf_odt/__init__.py 
 
   - remove decode.encode of filename stored in zip.

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2015-02-19 11:24:52 UTC (rev 7794)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2015-02-19 17:08:20 UTC (rev 7795)
@@ -43,15 +43,12 @@
     """Formats this writer supports."""
 
     default_stylesheet = 'html4css1.css'
-    default_stylesheet_dirs = ['.', utils.relative_path(
-        os.path.join(os.getcwd(), 'dummy'), os.path.dirname(__file__))]
+    default_stylesheet_dirs = ['.', os.path.abspath(os.path.dirname(__file__))]
 
     default_template = 'template.txt'
+    default_template_path = os.path.join(
+        os.path.dirname(os.path.abspath(__file__)), default_template)
 
-    default_template_path = utils.relative_path(
-        os.path.join(os.getcwd(), 'dummy'),
-        os.path.join(os.path.dirname(__file__), default_template))
-
     settings_spec = (
         'HTML-Specific Options',
         None,

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2015-02-19 11:24:52 UTC (rev 7794)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2015-02-19 17:08:20 UTC (rev 7795)
@@ -34,7 +34,7 @@
     """Formats this writer supports."""
 
     default_template = 'default.tex'
-    default_template_path = os.path.dirname(__file__)
+    default_template_path = os.path.dirname(os.path.abspath(__file__))
 
     default_preamble = '\n'.join([r'% PDF Standard Fonts',
                                   r'\usepackage{mathptmx} % Times',

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