follow name change, fix pdf template registration, add debian package tracking 3.5
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Thu, 20 Aug 2009 17:52:21 +0200
branch3.5
changeset 2936 f35b64718d02
parent 2935 e06b3eadef31
child 2937 36b11249014e
follow name change, fix pdf template registration, add debian package tracking
debian/control
utils.py
web/views/basetemplates.py
web/xhtml2fo.py
--- a/debian/control	Thu Aug 20 14:48:35 2009 +0200
+++ b/debian/control	Thu Aug 20 17:52:21 2009 +0200
@@ -62,7 +62,7 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, cubicweb-common (= ${source:Version}), python-simplejson (>= 1.3), python-elementtree
-Recommends: python-docutils, python-vobject, fckeditor, python-fyzz
+Recommends: python-docutils, python-vobject, fckeditor, python-fyzz, python-pysixt, fop
 Description: web interface library for the CubicWeb framework
  CubicWeb is a semantic web application framework.
  .
--- a/utils.py	Thu Aug 20 14:48:35 2009 +0200
+++ b/utils.py	Thu Aug 20 17:52:21 2009 +0200
@@ -328,7 +328,7 @@
     if __answer[0] is not None:
         return __answer[0]
     try:
-        import pyxmltrf
+        import pysixt
     except ImportError:
         __answer[0] = False
         return False
--- a/web/views/basetemplates.py	Thu Aug 20 14:48:35 2009 +0200
+++ b/web/views/basetemplates.py	Thu Aug 20 17:52:21 2009 +0200
@@ -527,6 +527,4 @@
 
 ## vregistry registration callback ############################################
 def registration_callback(vreg):
-    vreg.register_all(globals().values(), __name__, (PdfMainTemplate,) )
-    if can_do_pdf_conversion():
-        vreg.register(PdfMainTemplate)
+    vreg.register_all(globals().values(), __name__)
--- a/web/xhtml2fo.py	Thu Aug 20 14:48:35 2009 +0200
+++ b/web/xhtml2fo.py	Thu Aug 20 17:52:21 2009 +0200
@@ -2,11 +2,11 @@
 assert can_do_pdf_conversion()
 
 from xml.etree.ElementTree import QName, fromstring
-from pyxmltrf.standard.xhtml_xslfo.transformer import XHTML2FOTransformer
-from pyxmltrf.utils.xslfo.standard import cm
-from pyxmltrf.utils.xslfo import SimplePageMaster
-from pyxmltrf.standard.xhtml_xslfo.default_styling import default_styles
-from pyxmltrf.standard.xhtml_xslfo import XHTML_NS
+from pysixt.standard.xhtml_xslfo.transformer import XHTML2FOTransformer
+from pysixt.utils.xslfo.standard import cm
+from pysixt.utils.xslfo import SimplePageMaster
+from pysixt.standard.xhtml_xslfo.default_styling import default_styles
+from pysixt.standard.xhtml_xslfo import XHTML_NS
 
 
 class ReportTransformer(XHTML2FOTransformer):