WIP

product/ERP5/Document/Document.py

@@ -30,6 +30,7 @@
 import re
 from zLOG import LOG, WARNING
 from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ModuleSecurityInfo
 from Acquisition import aq_base
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.CMFCore.utils import _checkPermission
@@ -73,6 +74,7 @@ DEFAULT_IMAGE_QUALITY = 75.0
 DEFAULT_CONTENT_TYPE = 'text/html'
 
 class ConversionError(Exception):pass
+ModuleSecurityInfo(__name__).declarePublic('ConversionError')
 
 class DocumentProxyError(Exception):pass
 

product/ERP5/__init__.py

@@ -82,6 +82,13 @@ def initialize( context ):
   # Make sure InteactionWorkflow is visible in UI
   import Products.ERP5.InteractionWorkflow
 
+  ## OOo-related securities
+  # allow import of various exceptions in restricted environment
+  # so we can catch them in ZODB scripts and inform user nicely
+  from AccessControl.SecurityInfo import allow_module
+  allow_module('xmlrpclib.Fault')
+  allow_module('socket.error')
+
 # backward compatibility names
 XML = None
 UI = None

product/ERP5OOo/__init__.py

-##############################################################################
-#
-# Copyright (c) 2002-2005 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
-#                    Kevin Deldycke <kevin@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-"""
-    ERP5OOo is a product containing general purpose tools to parse
-    and handle OpenOffice documents.
-"""
-
-# Update ERP5 Globals
-from Products.ERP5Type.Utils import initializeProduct, updateGlobals
-from AccessControl.SecurityInfo import allow_module
-import sys, Permissions
-this_module = sys.modules[ __name__ ]
-document_classes = updateGlobals( this_module, globals(), permissions_module = Permissions)
-
-# Allow access to OOoParser from scripts
-from AccessControl import ModuleSecurityInfo
-ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('OOoParser',)
-ModuleSecurityInfo('Products.ERP5OOo.OOoUtils').declarePublic('newOOoParser',)
-
-# Define object classes and tools
-from OOoTemplate import OOoTemplate
-from FormPrintout import FormPrintout
-object_classes = (OOoTemplate, FormPrintout)
-portal_tools = ()
-content_classes = ()
-content_constructors = ()
-
-# Finish installation
-def initialize( context ):
-  import Document
-  initializeProduct(context, this_module, globals(),
-                         document_module = Document,
-                         document_classes = document_classes,
-                         object_classes = object_classes,
-                         portal_tools = portal_tools,
-                         content_constructors = content_constructors,
-                         content_classes = content_classes)
-
-# allow import of various exceptions in restricted environment
-# so we can catch them in ZODB scripts and inform user nicely
-allow_module('Products.ERP5.Document.Document.ConversionError')
-allow_module('xmlrpclib.Fault')
-allow_module('socket.error')