merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,7 @@ Fixed:
 - fixed IE double-submit when it shouldn't (sf bug 842254)
 - fixed check for JS pop()/push() to make more general (sf bug 877504)
 - fix re-enabling queries (sf bug 861940)
+- use supplied content-type on file uploads before trying filename)
 
 
 2003-12-17 0.6.4

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.130.2.6 2004-01-17 02:48:00 richard Exp $
+# $Id: client.py,v 1.130.2.7 2004-01-21 04:54:27 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -1866,8 +1866,11 @@ def parsePropsFromForm(self, num_re=re.compile('^\d+$')):
                                 props['name'] = fn
                             # use this info as the type/filename properties
                             if propdef.has_key('type'):
-                                props['type'] = mimetypes.guess_type(fn)[0]
-                                if not props['type']:
+                                if hasattr(value, 'type') and value.type:
+                                    props['type'] = value.type
+                                elif mimetypes.guess_type(fn)[0]:
+                                    props['type'] = mimetypes.guess_type(fn)[0]
+                                else:
                                     props['type'] = "application/octet-stream"
                             # finally, read the content
                             value = value.value