[Docutils-checkins] docutils/docutils/parsers/rst/directives images.py,1.21,1.22 misc.py,1.39,1.40 tables.py,1.12,1.13

[David G. <go...@us...>]

Update of /cvsroot/docutils/docutils/docutils/parsers/rst/directives
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3219/docutils/parsers/rst/directives

Modified Files:
	images.py misc.py tables.py 
Log Message:
differentiate between paths and URIs

Index: misc.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/parsers/rst/directives/misc.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- misc.py	14 Mar 2005 16:16:52 -0000	1.39
+++ misc.py	15 Mar 2005 00:37:49 -0000	1.40
@@ -27,7 +27,7 @@
     source = state_machine.input_lines.source(
         lineno - state_machine.input_offset - 1)
     source_dir = os.path.dirname(os.path.abspath(source))
-    path = ''.join(arguments[0].splitlines())
+    path = directives.path(arguments[0])
     path = os.path.normpath(os.path.join(source_dir, path))
     path = utils.relative_path(None, path)
     encoding = options.get('encoding', state.document.settings.input_encoding)
@@ -156,7 +156,7 @@
 
 raw.arguments = (1, 0, 1)
 raw.options = {'file': directives.path,
-               'url': directives.path,
+               'url': directives.uri,
                'encoding': directives.encoding}
 raw.content = 1
 

Index: tables.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/parsers/rst/directives/tables.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tables.py	14 Mar 2005 16:16:52 -0000	1.12
+++ tables.py	15 Mar 2005 00:37:50 -0000	1.13
@@ -152,7 +152,7 @@
                      'header': directives.unchanged,
                      'widths': directives.positive_int_list,
                      'file': directives.path,
-                     'url': directives.path,
+                     'url': directives.uri,
                      'encoding': directives.encoding,
                      'class': directives.class_option,
                      # field delimiter char

Index: images.py
===================================================================
RCS file: /cvsroot/docutils/docutils/docutils/parsers/rst/directives/images.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- images.py	14 Mar 2005 16:16:52 -0000	1.21
+++ images.py	15 Mar 2005 00:37:48 -0000	1.22
@@ -29,7 +29,7 @@
 def image(name, arguments, options, content, lineno,
           content_offset, block_text, state, state_machine):
     messages = []
-    reference = ''.join(arguments[0].split('\n'))
+    reference = directives.uri(arguments[0])
     options['uri'] = reference
     reference_node = None
     if options.has_key('target'):