Fix: cgi.FieldStorage had a misleading implementation of __nonzero__ and returned False for bool(request.files.name). This now returns True for existing files.

Thanks to Pascal Rosin via Twitter

2 files changed, 8 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index 871bd2e..13de046 100644
--- a/bottle.py
+++ b/bottle.py
@@ -122,6 +122,11 @@ if py31:
     class NCTextIOWrapper(TextIOWrapper):
         def close(self): pass # Keep wrapped buffer open.
 
+# The truth-value of cgi.FieldStorage is misleading.
+class FieldStorage(cgi.FieldStorage):
+    def __nonzero__(self):
+        return bool(self.list or self.file)
+
 # A bug in functools causes it to break if the wrapper is an instance method
 def update_wrapper(wrapper, wrapped, *a, **ka):
     try: functools.update_wrapper(wrapper, wrapped, *a, **ka)
@@ -1092,7 +1097,7 @@ class BaseRequest(object):
                                          newline='\n')
         elif py3k:
             args['encoding'] = 'ISO-8859-1'
-        data = cgi.FieldStorage(**args)
+        data = FieldStorage(**args)
         for item in (data.list or [])[:self.MAX_PARAMS]:
             post[item.name] = item if item.filename else item.value
         return post
diff --git a/test/test_environ.py b/test/test_environ.py
index 6637fa4..aabd929 100755
--- a/test/test_environ.py
+++ b/test/test_environ.py
@@ -285,6 +285,8 @@ class TestRequest(unittest.TestCase):
         self.assertTrue('file2' in request.files)
         self.assertTrue('file2' not in request.forms)
         self.assertEqual('filename2.py', request.POST['file2'].filename)
+        self.assertTrue(request.files.file2)
+        self.assertFalse(request.files.file77)
         # UTF-8 files
         x = request.POST['file2'].file.read()
         if (3,2,0) > sys.version_info >= (3,0,0):