[Erp5-report] r43776 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 25 17:06:12 CET 2011
Author: gabriel
Date: Fri Feb 25 17:06:11 2011
New Revision: 43776
URL: http://svn.erp5.org?rev=43776&view=rev
Log:
continuation of 43752. more refactoring
Modified:
erp5/trunk/utils/cloudooo/cloudooo/manager.py
erp5/trunk/utils/cloudooo/cloudooo/paster_application.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/manager.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/manager.py?rev=43776&r1=43775&r2=43776&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] Fri Feb 25 17:06:11 2011
@@ -27,7 +27,6 @@
#
##############################################################################
-import sys
import mimetypes
from mimetypes import guess_all_extensions, guess_extension
from base64 import encodestring, decodestring
@@ -52,9 +51,7 @@ def getHandlerObject(source_format, dest
registry_list = pattern.split()
if fnmatch(source_mimetype, registry_list[0]) and \
(fnmatch(destination_mimetype, registry_list[1]) or destination_format is None):
- handler_name = registry_list[2]
- handler = sys.modules[handler_name]
- return getattr(handler, handler_dict[handler_name])
+ return handler_dict[registry_list[2]]
class Manager(object):
Modified: erp5/trunk/utils/cloudooo/cloudooo/paster_application.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/paster_application.py?rev=43776&r1=43775&r2=43776&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/paster_application.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/paster_application.py [utf8] Fri Feb 25 17:06:11 2011
@@ -111,19 +111,17 @@ def application(global_config, **local_c
mimemapper.loadFilterList(application_hostname,
openoffice_port, **kw)
openoffice.release()
- mimetype_registry_str = local_config.get("mimetype_registry")
+ mimetype_registry = local_config.get("mimetype_registry", "")
+ kw["mimetype_registry"] = filter(None, mimetype_registry.split("\n"))
kw["handler_dict"] = {}
handler_mapping_list = local_config.get("handler_mapping", "").split("\n")
for line in filter(None, handler_mapping_list):
handler_name, object_name = line.strip().split()
import_name = "cloudooo.handler.%s.handler" % handler_name
- mimetype_registry_str = mimetype_registry_str.replace(handler_name,
- import_name)
if import_name not in sys.modules:
__import__(import_name)
- kw["handler_dict"][import_name] = object_name
-
- kw["mimetype_registry"] = filter(None, mimetype_registry_str.split("\n"))
+ handler = sys.modules[import_name]
+ kw["handler_dict"][handler_name] = getattr(handler, object_name)
kw["env"] = environment_dict
from manager import Manager
More information about the Erp5-report
mailing list