From 8713640f425933dcccfcba3933f7657017ad9fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 20 Mar 2009 08:59:10 +0000
Subject: [PATCH] remove obsolete things, pdftk-emulation hack is no longer
needed
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26109 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Form/PDFForm.py | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/product/ERP5Form/PDFForm.py b/product/ERP5Form/PDFForm.py
index 594f063a23..790f99940e 100644
--- a/product/ERP5Form/PDFForm.py
+++ b/product/ERP5Form/PDFForm.py
@@ -51,24 +51,7 @@ try:
except ImportError:
SUPPORTS_WEBDAV_LOCKS = 0
-# Programs linked against mandriva libgcj v 3.4.0 ave a strange issue that make
-# them impossible to popen within zope. That's why we do not use the 'real'
-# pdftk but a replacement program, pdftk-emulation available from nexedi's RPM
-# repositories.
-PDFTK_EXECUTABLE = "pdftk-emulation"
-
-# With python >= 2.4 and zope >= 2.7.8, pdftk-emulation is no longer needed
-import sys, App.version_txt
-python_version = sys.version.split(' ')[0].split('.')
-python_version = int(python_version[0]) * 100 +\
- int(python_version[1])
-zope_version = App.version_txt.getZopeVersion()
-zope_version = int(zope_version[0]) * 100 * 100 +\
- int(zope_version[1]) * 100 +\
- int(zope_version[2])
-if python_version >= 204 and zope_version >= 20708:
- PDFTK_EXECUTABLE = "pdftk"
-
+PDFTK_EXECUTABLE = "pdftk"
class PDFTk:
"""A class to wrapp calls to pdftk executable, found at
--
2.30.9