Merge branch 'master' of github.com:NYUCCL/psiTurk

NYUCCL · Mar 23, 2021 · e728133 · e728133
2 parents db83b6a + f62b8f7
commit e728133
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,8 @@ thought through.
   call `render_template()` on it yourself.
 - psiturk.js `preloadPages()` now returns a `Promise`. See the [migration guide](https://psiturk.readthedocs.io/en/latest/migrating.html) for links to
   examples of using the new approach.
+- psiturk exception `InvalidUsage` changed to `InvalidUsageError`. Breaks
+  `custom.py` files generated under psiturk v2.
 
 #### Configuration files
 - the configuration file created by running `psiturk-setup-example`

diff --git a/psiturk/experiment_errors.py b/psiturk/experiment_errors.py
@@ -154,7 +154,7 @@ def error_page(self, request, contact_on_error):
 
 
 class ExperimentApiError(Exception):
-    
+
     def __init__(self, message, status_code=500, payload=None):
         super().__init__()
         self.message = message
@@ -168,8 +168,13 @@ def to_dict(self):
 
 
 class InvalidUsageError(ExperimentApiError):
-    
+
     def __init__(self, *args, **kwargs):
         if 'status_code' not in kwargs:
             kwargs['status_code'] = 400
         super(InvalidUsageError, self).__init__(*args, **kwargs)
+
+class InvalidUsage(InvalidUsageError):
+    # backwards compatibility with psiturk v2's custom.py files
+    # generated by psiturk-setup-example
+    pass