[tryton-debian-vcs] relatorio branch upstream updated. upstream/0.6.2-1-g4f0ea80

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/relatorio.git;a=commitdiff;h=upstream/0.6.2-1-g4f0ea80

commit 4f0ea80cb5620eb65b53ffcf23709b12930bd772
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Jul 2 22:20:37 2016 +0200

    Adding upstream version 0.6.3.

diff --git a/CHANGES b/CHANGES
index 7f92948..f9bde02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.6.3 - 20160629
+* Update calcext:value-type with the same guessed type
+* Register MarkupTemplate for 'markup' mimetype instead of 'xml'
+
 0.6.2 - 20150919
 * Add name argument for "image:" in odf
 * Remove table:end-cell-address from draw:frame as the address could be wrong
diff --git a/PKG-INFO b/PKG-INFO
index 5469835..839fbac 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: relatorio
-Version: 0.6.2
+Version: 0.6.3
 Summary: A templating library able to output odt and pdf files
 Home-page: http://relatorio.tryton.org/
 Author: Cedric Krier
@@ -29,9 +29,6 @@ Description: Relatorio
         
         For SVG support, you need PyCha 0.4.2 or later.
         
-            http://www.lorenzogil.com/projects/pycha/
-        
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
diff --git a/README b/README
index 104a8b0..76e37f3 100644
--- a/README
+++ b/README
@@ -20,6 +20,3 @@ Since the 0.4.0 release, pycha upstream author included most of our patches. So
 it is not necessary anymore to use our friendly fork of the project.
 
 For SVG support, you need PyCha 0.4.2 or later.
-
-    http://www.lorenzogil.com/projects/pycha/
-
diff --git a/relatorio.egg-info/PKG-INFO b/relatorio.egg-info/PKG-INFO
index 5469835..839fbac 100644
--- a/relatorio.egg-info/PKG-INFO
+++ b/relatorio.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: relatorio
-Version: 0.6.2
+Version: 0.6.3
 Summary: A templating library able to output odt and pdf files
 Home-page: http://relatorio.tryton.org/
 Author: Cedric Krier
@@ -29,9 +29,6 @@ Description: Relatorio
         
         For SVG support, you need PyCha 0.4.2 or later.
         
-            http://www.lorenzogil.com/projects/pycha/
-        
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
diff --git a/relatorio.egg-info/requires.txt b/relatorio.egg-info/requires.txt
index a315bff..7f0b2b9 100644
--- a/relatorio.egg-info/requires.txt
+++ b/relatorio.egg-info/requires.txt
@@ -1,2 +1,6 @@
 Genshi >= 0.5
-lxml >= 2.0
\ No newline at end of file
+lxml >= 2.0
+
+[chart]
+pycha >= 0.4.0
+pyyaml
diff --git a/relatorio/__init__.py b/relatorio/__init__.py
index 91f89f1..7c23957 100644
--- a/relatorio/__init__.py
+++ b/relatorio/__init__.py
@@ -12,5 +12,5 @@ and report together, find reports by mimetypes/name/python objects.
 from .reporting import MIMETemplateLoader, ReportRepository, Report
 from . import templates
 
-__version__ = '0.6.2'
+__version__ = '0.6.3'
 __all__ = ['MIMETemplateLoader', 'ReportRepository', 'Report', 'templates']
diff --git a/relatorio/templates/base.py b/relatorio/templates/base.py
index 2b69076..27ac7a5 100644
--- a/relatorio/templates/base.py
+++ b/relatorio/templates/base.py
@@ -42,4 +42,4 @@ class RelatorioStream(genshi.core.Stream):
         return RelatorioStream(self.events | function, self.serializer)
 
 MIMETemplateLoader.add_factory('text', NewTextTemplate)
-MIMETemplateLoader.add_factory('xml', MarkupTemplate)
+MIMETemplateLoader.add_factory('markup', MarkupTemplate)
diff --git a/relatorio/templates/opendocument.py b/relatorio/templates/opendocument.py
index 4e6c252..e392208 100644
--- a/relatorio/templates/opendocument.py
+++ b/relatorio/templates/opendocument.py
@@ -410,6 +410,10 @@ class Template(MarkupTemplate):
 
         office_name = '{%s}value' % self.namespaces['office']
         office_valuetype = '{%s}value-type' % self.namespaces['office']
+        if 'calcext' in self.namespaces:
+            calcext_valuetype = '{%s}value-type' % self.namespaces['calcext']
+        else:
+            calcext_valuetype = None
 
         py_replace = '{%s}replace' % GENSHI_URI
 
@@ -506,6 +510,12 @@ class Template(MarkupTemplate):
                          cache_id))
                 parent.attrib.pop(office_valuetype, None)
                 parent.attrib.pop(office_name, None)
+                if (calcext_valuetype and
+                        parent.attrib.pop(calcext_valuetype, None)):
+                    update_py_attrs(parent,
+                        "{'%s': __relatorio_guess_type("
+                        "__relatorio_get_cache(%s))}" %
+                        (calcext_valuetype, cache_id))
 
     def _handle_column_loops(self, statement, ancestor, opening,
                              outer_o_node, outer_c_node):
diff --git a/setup.py b/setup.py
index 412bff6..d30ff7f 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,9 @@ setup(
         "Genshi >= 0.5",
         "lxml >= 2.0"
     ],
+    extras_require={
+        'chart': ['pycha >= 0.4.0', 'pyyaml'],  # pycairo
+        },
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
-- 
relatorio