Merge pull request NYUCCL#253 from jacob-lee/master

The methods get_trial_data, get_question_data and get_eventdata were
not catching TypeError and ValueError exceptions as intended, causing data download in the psiturk shell to fail.

The list of exception classes needs to be enclosed in parentheses.

psiturk/models.py

@@ -57,7 +57,7 @@ def __repr__(self):
     def get_trial_data(self):
         try:
             trialdata = json.loads(self.datastring)["data"]
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             # There was no data to return.
             print("No trial data found in record:", self)
             return("")
@@ -81,7 +81,7 @@ def get_trial_data(self):
     def get_event_data(self):
         try:
             eventdata = json.loads(self.datastring)["eventdata"]
-        except ValueError, TypeError:
+        except (ValueError, TypeError):
             # There was no data to return.
             print("No event data found in record:", self)
             return("")
@@ -101,7 +101,7 @@ def get_event_data(self):
     def get_question_data(self):
         try:
             questiondata = json.loads(self.datastring)["questiondata"]
-        except TypeError, ValueError:
+        except (TypeError, ValueError):
             # There was no data to return.
             print("No question data found in record:", self)
             return("")