- Show a message instead of exception for empty file upload (fixes #21)

CHANGES.rst

@@ -4,7 +4,8 @@ Changelog
 4.3 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Show a message instead of exception for empty file upload
+  (`#21 <https://github.com/zopefoundation/Products.PythonScripts/issues/21>_`)
 
 
 4.2 (2018-10-11)

src/Products/PythonScripts/PythonScript.py

@@ -176,7 +176,9 @@ def ZPythonScriptHTML_upload(self, REQUEST, file=''):
 
         if not isinstance(file, str):
             if not file:
-                raise ValueError('File not specified')
+                return self.ZPythonScriptHTML_editForm(self, REQUEST,
+                                    manage_tabs_message='No file specified',
+                                    manage_tabs_type='warning')
             file = file.read()
 
         self.write(file)

src/Products/PythonScripts/tests/testPythonScript.py

@@ -10,6 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+import codecs
 import contextlib
 import os
 import six
@@ -19,6 +20,9 @@
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
+from Testing.testbrowser import Browser
+from Testing.ZopeTestCase import FunctionalTestCase
+import Zope2
 
 from Products.PythonScripts.PythonScript import PythonScript
 
@@ -323,3 +327,29 @@ def test_class_conforms_to_IWriteLock(self):
         except ImportError:
             from webdav.interfaces import IWriteLock
         verifyClass(IWriteLock, PythonScript)
+
+
+class PythonScriptBrowserTests(FunctionalTestCase):
+    """Browser testing Python Scripts"""
+
+    def setUp(self):
+        from Products.PythonScripts.PythonScript import manage_addPythonScript
+        super(PythonScriptBrowserTests, self).setUp()
+
+        Zope2.App.zcml.load_site(force=True)
+
+        uf = self.app.acl_users
+        uf.userFolderAddUser('manager', 'manager_pass', ['Manager'], [])
+        manage_addPythonScript(self.app, 'py_script')
+
+        self.browser = Browser()
+        self.browser.addHeader(
+            'Authorization',
+            'basic {}'.format(codecs.encode(
+                b'manager:manager_pass', 'base64').decode()))
+        self.browser.open('http://localhost/py_script/manage_main')
+
+    def test_ZPythonScriptHTML_upload__no_file(self):
+        """It renders an error message if no file is uploaded."""
+        self.browser.getControl('Upload File').click()
+        self.assertIn('No file specified', self.browser.contents)