[CMF-checkins] SVN: CMF/branches/1.6/CMFCore/FSFile.py Shut up a deprecation warning.

Stefan H. Holek stefan at epy.co.at
Fri Feb 24 12:06:23 EST 2006


Log message for revision 41776:
  Shut up a deprecation warning.
  

Changed:
  U   CMF/branches/1.6/CMFCore/FSFile.py

-=-
Modified: CMF/branches/1.6/CMFCore/FSFile.py
===================================================================
--- CMF/branches/1.6/CMFCore/FSFile.py	2006-02-24 16:54:41 UTC (rev 41775)
+++ CMF/branches/1.6/CMFCore/FSFile.py	2006-02-24 17:06:22 UTC (rev 41776)
@@ -20,8 +20,11 @@
 from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 from OFS.Cache import Cacheable
-from OFS.content_types import guess_content_type
 from OFS.Image import File
+try:
+    from zope.app.content_types import guess_content_type
+except ImportError: # BBB: for Zope < 2.9
+    from OFS.content_types import guess_content_type
 
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType



More information about the CMF-checkins mailing list