[gentoo-commits] gentoo-x86 commit in dev-python/docutils/files: docutils-0.7-python-3.2-xml.etree.ElementTree.patch docutils-0.7-python-3.2-configparser.patch

[gentoo-commits] gentoo-x86 commit in dev-python/docutils/files: docutils-0.7-python-3.2-xml.etree.ElementTree.patch docutils-0.7-python-3.2-configparser.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/04/09 23:56:45

  Added:                docutils-0.7-python-3.2-xml.etree.ElementTree.patch
                        docutils-0.7-python-3.2-configparser.patch
  Log:
  Fix compatibility with Python 3.2 (bug #351063).
  
  (Portage version: 2.2.0_alpha29_p10/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch?rev=1.1&content-type=text/plain

Index: docutils-0.7-python-3.2-xml.etree.ElementTree.patch
===================================================================
--- docutils/writers/odf_odt/__init__.py
+++ docutils/writers/odf_odt/__init__.py
@@ -300,7 +300,10 @@
 
 def ToString(et):
     outstream = StringIO.StringIO()
-    et.write(outstream)
+    if sys.version_info >= (3, 2):
+        et.write(outstream, encoding="unicode")
+    else:
+        et.write(outstream)
     s1 = outstream.getvalue()
     outstream.close()
     return s1



1.1                  dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch?rev=1.1&content-type=text/plain

Index: docutils-0.7-python-3.2-configparser.patch
===================================================================
http://sourceforge.net/tracker/?func=detail&atid=422030&aid=3149845&group_id=38414

--- docutils/frontend.py
+++ docutils/frontend.py
@@ -671,7 +671,7 @@
         raise KeyError('No option with dest == %r.' % dest)
 
 
-class ConfigParser(CP.ConfigParser):
+class ConfigParser(CP.RawConfigParser):
 
     old_settings = {
         'pep_stylesheet': ('pep_html writer', 'stylesheet'),
@@ -693,7 +693,7 @@
 """
 
     def __init__(self, *args, **kwargs):
-        CP.ConfigParser.__init__(self, *args, **kwargs)
+        CP.RawConfigParser.__init__(self, *args, **kwargs)
 
         self._files = []
         """List of paths of configuration files read."""
@@ -708,7 +708,7 @@
             except IOError:
                 continue
             try:
-                CP.ConfigParser.readfp(self, fp, filename)
+                CP.RawConfigParser.readfp(self, fp, filename)
             except UnicodeDecodeError:
                 sys.stderr.write(self.not_utf8_error % (filename, filename))
                 fp.close()
@@ -749,7 +749,7 @@
                 except KeyError:
                     continue
                 if option.validator:
-                    value = self.get(section, setting, raw=1)
+                    value = self.get(section, setting)
                     try:
                         new_value = option.validator(
                             setting, value, option_parser,
@@ -778,7 +778,7 @@
         section_dict = {}
         if self.has_section(section):
             for option in self.options(section):
-                section_dict[option] = self.get(section, option, raw=1)
+                section_dict[option] = self.get(section, option)
         return section_dict