[Erp5-report] r42159 kazuhiko - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Jan 10 11:52:59 2011
New Revision: 42159

URL: http://svn.erp5.org?rev=42159&view=rev
Log:
importing once is enough.

Modified:
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=42159&r1=42158&r2=42159&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Mon Jan 10 11:52:59 2011
@@ -57,6 +57,15 @@ from Products.PageTemplates.Expressions 
 from Products.PageTemplates.Expressions import SecureModuleImporter
 from Products.ZCatalog.Lazy import LazyMap
 
+try:
+  import chardet
+except ImportError:
+  chardet = None
+try:
+  import magic
+except ImportError:
+  magic = None
+
 def simple_decorator(decorator):
   """Decorator to turn simple function into well-behaved decorator
 
@@ -3276,14 +3285,6 @@ def guessEncodingFromText(data, content_
   By default python-magic is used
   XXX this implementation must migrate to cloudooo
   """
-  try:
-    import chardet
-  except ImportError:
-    chardet = None
-  try:
-    import magic
-  except ImportError:
-    magic = None
   if chardet is not None and content_type == 'text/html':
     # chardet works fine on html document
     return chardet.detect(data).get('encoding', None)