headers
felixwiemann | 1 Jul 2005 18:39
Picon

r3644 - in trunk/docutils: docs/user/config.txt docutils/transforms/universal.py docutils/writers/html4css1.py test/functional/expected/pep_html.html

Author: felixwiemann
Date: 2005-07-01 18:39:51 +0200 (Fri, 01 Jul 2005)
New Revision: 3644

Modified:
   trunk/docutils/docs/user/config.txt
   trunk/docutils/docutils/transforms/universal.py
   trunk/docutils/docutils/writers/html4css1.py
   trunk/docutils/test/functional/expected/pep_html.html
Log:
improved cloaking mechanism

Modified: trunk/docutils/docs/user/config.txt
===================================================================
--- trunk/docutils/docs/user/config.txt	2005-06-30 17:53:17 UTC (rev 3643)
+++ trunk/docutils/docs/user/config.txt	2005-07-01 16:39:51 UTC (rev 3644)
 <at>  <at>  -565,14 +565,14  <at>  <at> 

 _`cloak_email_addresses`
     Scramble email addresses to confuse harvesters.  In the visible
-    text of an email address, the " <at> " will be replaced by "at", and
-    all periods (".") will be replaced by "dot", with spaces added.
-    In the reference URI, the address will be replaced by %-escapes.
-    For example, "abc <at> example.org" will be output as::
+    text of an email address, the " <at> " and all periods (".") will be
+    surrounded by ``<span>`` tags.  In the reference URI, the address
+    will be replaced by %-escapes.  For example, "abc <at> example.org"
+    will be output as::

         <a class="reference"
(Continue reading)

Permalink | Reply | 0 comments |
headers
goodger | 3 Jul 2005 01:08
Picon

r3645 - trunk/docutils/docutils/io.py

Author: goodger
Date: 2005-07-03 01:08:35 +0200 (Sun, 03 Jul 2005)
New Revision: 3645

Modified:
   trunk/docutils/docutils/io.py
Log:
encode Unicode strings only; wrapped a line

Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py	2005-07-01 16:39:51 UTC (rev 3644)
+++ trunk/docutils/docutils/io.py	2005-07-02 23:08:35 UTC (rev 3645)
 <at>  <at>  -144,7 +144,8  <at>  <at> 
         raise NotImplementedError

     def encode(self, data):
-        if self.encoding and self.encoding.lower() == 'unicode':
+        if ( self.encoding and self.encoding.lower() == 'unicode'
+             or not isinstance(data, UnicodeType)):
             return data
         else:
             try:
 <at>  <at>  -156,7 +157,8  <at>  <at> 
                     # We are using xmlcharrefreplace with a Python
                     # version that doesn't support it (2.1 or 2.2), so
                     # we emulate its behavior.
-                    return ''.join([self.xmlcharref_encode(char) for char in data])
+                    return ''.join([self.xmlcharref_encode(char)
+                                    for char in data])
(Continue reading)

Permalink | Reply | 0 comments |
headers
goodger | 3 Jul 2005 01:08
Picon

r3646 - in trunk/docutils: docutils/writers/null.py test/DocutilsTestSupport.py test/test_writers/test_null.py

Author: goodger
Date: 2005-07-03 01:08:53 +0200 (Sun, 03 Jul 2005)
New Revision: 3646

Modified:
   trunk/docutils/docutils/writers/null.py
   trunk/docutils/test/DocutilsTestSupport.py
   trunk/docutils/test/test_writers/test_null.py
Log:
revert docutils.writers.null.Writer.output to None, now with docutils.io.Output and test support

Modified: trunk/docutils/docutils/writers/null.py
===================================================================
--- trunk/docutils/docutils/writers/null.py	2005-07-02 23:08:35 UTC (rev 3645)
+++ trunk/docutils/docutils/writers/null.py	2005-07-02 23:08:53 UTC (rev 3646)
 <at>  <at>  -20,4 +20,4  <at>  <at> 
     config_section_dependencies = ('writers',)

     def translate(self):
-        self.output = u''
+        pass

Modified: trunk/docutils/test/DocutilsTestSupport.py
===================================================================
--- trunk/docutils/test/DocutilsTestSupport.py	2005-07-02 23:08:35 UTC (rev 3645)
+++ trunk/docutils/test/DocutilsTestSupport.py	2005-07-02 23:08:53 UTC (rev 3646)
 <at>  <at>  -153,13 +153,19  <at>  <at> 
             expected = expected.encode('raw_unicode_escape')
         try:
             self.assertEquals(output, expected)
(Continue reading)

Permalink | Reply | 0 comments |
headers
goodger | 3 Jul 2005 01:10
Picon

r3647 - trunk/sandbox/blais/pickle_writer/pickle.py

Author: goodger
Date: 2005-07-03 01:10:55 +0200 (Sun, 03 Jul 2005)
New Revision: 3647

Modified:
   trunk/sandbox/blais/pickle_writer/pickle.py
Log:
updated; should not support "all format-specific elements"

Modified: trunk/sandbox/blais/pickle_writer/pickle.py
===================================================================
--- trunk/sandbox/blais/pickle_writer/pickle.py	2005-07-02 23:08:53 UTC (rev 3646)
+++ trunk/sandbox/blais/pickle_writer/pickle.py	2005-07-02 23:10:55 UTC (rev 3647)
 <at>  <at>  -31,11 +31,4  <at>  <at> 

         # Note: we use the highest protocol, it has some binary in it.
         # - we don't want to return the pickled contents in the output.
-        self.pickled = pickle.dumps(self.document)
-        
-        # Pickle the document to a string.
-        self.output = pickled.decode('latin-1')
-
-    def supports(self, format):
-        """This writer supports all format-specific elements."""
-        return 1
+        self.output = pickle.dumps(self.document)

-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
(Continue reading)

Permalink | Reply | 11 comments |
headers
goodger | 3 Jul 2005 01:15
Picon

r3648 - trunk/docutils/HISTORY.txt

Author: goodger
Date: 2005-07-03 01:15:43 +0200 (Sun, 03 Jul 2005)
New Revision: 3648

Modified:
   trunk/docutils/HISTORY.txt
Log:
updated

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2005-07-02 23:10:55 UTC (rev 3647)
+++ trunk/docutils/HISTORY.txt	2005-07-02 23:15:43 UTC (rev 3648)
 <at>  <at>  -86,10 +86,6  <at>  <at> 
   - Made ``xmlcharrefreplace`` the default output encoding error
     handler.

-* docutils/writers/null.py:
-
-  - The Null Writer now returns an empty string instead of None.
-
 * docutils/writers/unicode_latex.py: Added to project; mapping of
   Unicode characters to LaTeX equivalents.

-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
(Continue reading)

Permalink | Reply | 0 comments |
headers
goodger | 3 Jul 2005 01:31
Picon

r3649 - trunk/docutils/docutils/writers/__init__.py

Author: goodger
Date: 2005-07-03 01:31:10 +0200 (Sun, 03 Jul 2005)
New Revision: 3649

Modified:
   trunk/docutils/docutils/writers/__init__.py
Log:
updated docstrings

Modified: trunk/docutils/docutils/writers/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/__init__.py	2005-07-02 23:15:43 UTC (rev 3648)
+++ trunk/docutils/docutils/writers/__init__.py	2005-07-02 23:31:10 UTC (rev 3649)
 <at>  <at>  -36,8 +36,8  <at>  <at> 
     """The document to write (Docutils doctree); set by `write`."""

     output = None
-    """Final translated form of `document` (Unicode string);
-    set by `translate`."""
+    """Final translated form of `document` (Unicode string for text, binary
+    string for other forms); set by `translate`."""

     language = None
     """Language module for the document; set by `write`."""
 <at>  <at>  -75,8 +75,8  <at>  <at> 

     def translate(self):
         """
-        Do final translation of `self.document` into `self.output` (Unicode
-        string).  Called from `write`.  Override in subclasses.
(Continue reading)

Permalink | Reply | 0 comments |
headers
goodger | 3 Jul 2005 03:16
Picon

r3650 - trunk/docutils/docutils/core.py

Author: goodger
Date: 2005-07-03 03:15:56 +0200 (Sun, 03 Jul 2005)
New Revision: 3650

Modified:
   trunk/docutils/docutils/core.py
Log:
better wrapping

Modified: trunk/docutils/docutils/core.py
===================================================================
--- trunk/docutils/docutils/core.py	2005-07-02 23:31:10 UTC (rev 3649)
+++ trunk/docutils/docutils/core.py	2005-07-03 01:15:56 UTC (rev 3650)
 <at>  <at>  -493,8 +493,8  <at>  <at> 
     # Create fresh Transformer object, to be populated from Writer component.
     document.transformer = Transformer(document)
     # Don't apply default transforms twice:
-    document.transformer.default_transforms = (document.transformer
-                                               .reprocess_transforms)
+    document.transformer.default_transforms = (
+        document.transformer.reprocess_transforms)
     reader = docutils.readers.doctree.Reader(parser_name='null')
     pub = Publisher(reader, None, writer,
                     source=io.DocTreeInput(document),

-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
(Continue reading)

Permalink | Reply | 0 comments |
headers
felixwiemann | 3 Jul 2005 10:39
Picon

r3651 - trunk/docutils/docutils/io.py

Author: felixwiemann
Date: 2005-07-03 10:39:39 +0200 (Sun, 03 Jul 2005)
New Revision: 3651

Modified:
   trunk/docutils/docutils/io.py
Log:
added assertion and comment

Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py	2005-07-03 01:15:56 UTC (rev 3650)
+++ trunk/docutils/docutils/io.py	2005-07-03 08:39:39 UTC (rev 3651)
 <at>  <at>  -67,8 +67,12  <at>  <at> 

             locale.setlocale(locale.LC_ALL, '')
         """
-        if (self.encoding and self.encoding.lower() == 'unicode'
-            or isinstance(data, UnicodeType)):
+        if self.encoding and self.encoding.lower() == 'unicode':
+            assert isinstance(data, UnicodeType), (
+                'input encoding is "unicode" '
+                'but input is not a unicode object')
+        if isinstance(data, UnicodeType):
+            # Accept unicode even if self.encoding != 'unicode'.
             return data
         encodings = [self.encoding]
         if not self.encoding:

-------------------------------------------------------
(Continue reading)

Permalink | Reply | 0 comments |
headers
felixwiemann | 3 Jul 2005 10:40
Picon

r3652 - trunk/docutils/HISTORY.txt

Author: felixwiemann
Date: 2005-07-03 10:40:17 +0200 (Sun, 03 Jul 2005)
New Revision: 3652

Modified:
   trunk/docutils/HISTORY.txt
Log:
added history entry

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2005-07-03 08:39:39 UTC (rev 3651)
+++ trunk/docutils/HISTORY.txt	2005-07-03 08:40:17 UTC (rev 3652)
 <at>  <at>  -35,6 +35,7  <at>  <at> 
 * docutils/io.py:

   - Added ``DocTreeInput`` class, for reprocessing existing documents.
+  - Added support for non-Unicode (e.g. binary) writer output.

 * docutils/parsers/null.py: Added to project; a do-nothing parser.

-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
Permalink | Reply | 0 comments |
headers
felixwiemann | 3 Jul 2005 11:40
Picon

r3653 - trunk/docutils/docutils/io.py

Author: felixwiemann
Date: 2005-07-03 11:40:40 +0200 (Sun, 03 Jul 2005)
New Revision: 3653

Modified:
   trunk/docutils/docutils/io.py
Log:
added assertion and comment

Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py	2005-07-03 08:40:17 UTC (rev 3652)
+++ trunk/docutils/docutils/io.py	2005-07-03 09:40:40 UTC (rev 3653)
 <at>  <at>  -148,9 +148,12  <at>  <at> 
         raise NotImplementedError

     def encode(self, data):
-        if ( self.encoding and self.encoding.lower() == 'unicode'
-             or not isinstance(data, UnicodeType)):
+        if self.encoding and self.encoding.lower() == 'unicode':
+            assert isinstance(data, UnicodeType), 'no unicode output'
             return data
+        if not isinstance(data, UnicodeType):
+            # Non-unicode (e.g. binary) output.
+            return data
         else:
             try:
                 return data.encode(self.encoding, self.error_handler)

-------------------------------------------------------
(Continue reading)

Permalink | Reply | 0 comments |

Gmane