[Erp5-report] r9063 - /erp5/trunk/products/ERP5Form/ListBox.py

[nobody at svn.erp5.org]

Author: chris
Date: Mon Aug  7 12:07:11 2006
New Revision: 9063

URL: http://svn.erp5.org?rev=9063&view=rev
Log:
- Fixed 2 bugs in Listbox, one concerning unicode support and another concerning a file instance in the REQUEST that couldn't be pickled

Modified:
    erp5/trunk/products/ERP5Form/ListBox.py

Modified: erp5/trunk/products/ERP5Form/ListBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ListBox.py?rev=9063&r1=9062&r2=9063&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ListBox.py (original)
+++ erp5/trunk/products/ERP5Form/ListBox.py Mon Aug  7 12:07:11 2006
@@ -926,7 +926,7 @@
 
         # Remove useless parameters.
         for k, v in params.items():
-          if v in (None, ''):
+          if v in (None, '') or hasattr(v, 'read'):
             del params[k]
 
     # Set the columns. The idea behind this is that, instead of selecting all columns,
@@ -1841,7 +1841,7 @@
       # Process the value.
       if processed_value is None:
         processed_value = u''
-      else:
+      elif not isinstance(processed_value, unicode):
         processed_value = unicode(str(processed_value), self.renderer.getEncoding())
 
       value_list.append((original_value, processed_value))