Merge pull request #525 from akhmerov/issue-524

Convert options_from_form into traitlet

dockerspawner/dockerspawner.py

@@ -330,12 +330,16 @@ def _default_options_form(self):
             options=options
         )
 
-    def options_from_form(self, formdata):
-        """Turn options formdata into user_options"""
-        options = {}
-        if 'image' in formdata:
-            options['image'] = formdata['image'][0]
-        return options
+    @default("options_from_form")
+    def _default_options_from_form(self):
+        def options_from_form(formdata):
+            """Turn options formdata into user_options"""
+            options = {}
+            if 'image' in formdata:
+                options['image'] = formdata['image'][0]
+            return options
+
+        return options_from_form
 
     pull_policy = CaselessStrEnum(
         ["always", "ifnotpresent", "never", "skip"],

tests/test_dockerspawner.py

@@ -14,6 +14,7 @@
 from jupyterhub.tests.test_api import add_user, api_request
 from jupyterhub.utils import url_path_join
 from tornado.httpclient import AsyncHTTPClient
+from traitlets.config import Config
 
 from dockerspawner import DockerSpawner
 
@@ -410,6 +411,11 @@ def test_options_from_form():
     formdata = {'image': ['1.0', '1.1']}
     assert spawner.options_from_form(formdata) == {'image': '1.0'}
 
+    config = Config()
+    config.DockerSpawner.options_from_form = lambda formdata: {"ok": True}
+    spawner = DockerSpawner(config=config)
+    assert spawner.options_from_form(formdata) == {"ok": True}
+
 
 @pytest.mark.parametrize("escape_type", ("legacy", escape))
 def test_validate_escape(escape_type):