Changeset 1743 for ZMS/trunk/_fileutil.py

Timestamp:

03.12.2011 23:32:07 (6 months ago)

Author:

zmsdev

Message:

applied minor fixes for (ajax) file-upload

File:

• ZMS/trunk/_fileutil.py (modified) (4 diffs)

ZMS/trunk/_fileutil.py

@@ -19 +19 @@
 # Imports.
 from ZPublisher.Iterators import filestream_iterator
-try: # >= Zope-2.10
-  from zope.contenttype import guess_content_type
-except: # < Zope-2.10
-  from zope.app.content_types import guess_content_type
 import fnmatch
 import os
@@ -29 +25 @@
 import tempfile
 import zipfile
+# Product Imports.
+import _globals
 
 
@@ -211 +209 @@
           else:
             try:
-              mt, enc = guess_content_type( local_filename)
+              mt, enc = _globals.guess_contenttype( local_filename)
             except:
               mt, enc = 'content/unknown', ''
@@ -247 +245 @@
     data = filestream_iterator( filename, 'r'+mode)
   try:
-    mt, enc  = guess_content_type( filename, data)
+    mt, enc  = _globals.guess_contenttype( filename, data)
   except:
     mt, enc = 'content/unknown', ''