From be169c67c2e1e1be05b5a0b9d5333803aff3d335 Mon Sep 17 00:00:00 2001
From: Dave Eargle <dave@daveeargle.com>
Date: Fri, 28 Jun 2019 13:44:00 -0600
Subject: [PATCH] make python2 compat

---
 psiturk/psiturk_exceptions.py |  9 ++++-----
 psiturk/psiturk_shell.py      |  4 ++--
 psiturk/version.py            |  2 +-
 tests/test_noaws.py           | 13 +++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/psiturk/psiturk_exceptions.py b/psiturk/psiturk_exceptions.py
index addae89e3..9e24d569d 100644
--- a/psiturk/psiturk_exceptions.py
+++ b/psiturk/psiturk_exceptions.py
@@ -1,6 +1,6 @@
 class PsiturkException(Exception):
     def __init__(self, **kwargs):
-        super().__init__()
+        super(PsiturkException, self).__init__()
         self.message=kwargs['message'] if 'message' in kwargs else ''
         
     def __str__(self):
@@ -22,20 +22,19 @@ def __init__(self, **kwargs):
                 '- `psiturk debug -p`'])
                 
         if 'message' in kwargs:
-            # import pytest; pytest.set_trace()
             kwargs['message'] = ''.join([kwargs['message'], still_can_do])
             
-        super().__init__(**kwargs)
+        super(AmtServicesException, self).__init__(**kwargs)
 
 class AWSAccessKeysNotSetError(AmtServicesException):
     def __init__(self, **kwargs):
         message = 'AWS access keys not set in ~/.psiturkconfig; please enter valid credentials.'
-        super().__init__(message=message, **kwargs)
+        super(AWSAccessKeysNotSetError, self).__init__(message=message, **kwargs)
 
 class NoMturkConnectionError(AmtServicesException):
     def __init__(self, **kwargs):
         message = 'Sorry, unable to connect to Amazon Mechanical Turk. AWS credentials invalid.'
-        super().__init__(message=message, **kwargs)
+        super(NoMturkConnectionError, self).__init__(message=message, **kwargs)
 
 ####################################################
 # AMT Service Wrapper Exceptions
diff --git a/psiturk/psiturk_shell.py b/psiturk/psiturk_shell.py
index 4b4dceafa..1b7e5ca6a 100644
--- a/psiturk/psiturk_shell.py
+++ b/psiturk/psiturk_shell.py
@@ -99,7 +99,7 @@ def postcmd(self, *args):
         return Cmd.postcmd(self, *args)
 
     def __init__(self, config, server, quiet=False):
-        persistent_history_file=config['Shell Parameters']['persistent_history_file']
+        persistent_history_file=config.get('Shell Parameters','persistent_history_file')
         Cmd.__init__(self, persistent_history_file=persistent_history_file)
         self.config = config
         self.server = server
@@ -770,7 +770,7 @@ def __init__(self, config, server, sandbox, quiet=False):
         self.sandbox = sandbox
         self.sandbox_hits = 0
         self.live_hits = 0
-        super().__init__(config, server, quiet)
+        super(PsiturkNetworkShell, self).__init__(config, server, quiet)
         
         if not self.amt_services_wrapper:
             sys.exit()
diff --git a/psiturk/version.py b/psiturk/version.py
index a7b18b372..67a562a0c 100644
--- a/psiturk/version.py
+++ b/psiturk/version.py
@@ -1 +1 @@
-version_number = '2.3.1'
+version_number = '2.3.2'
diff --git a/tests/test_noaws.py b/tests/test_noaws.py
index 1a7c8141a..787f46963 100644
--- a/tests/test_noaws.py
+++ b/tests/test_noaws.py
@@ -10,9 +10,9 @@ def test_awskeys_invalid(capfd):
     
     config = PsiturkConfig()
     config.load_config()
-    config['Shell Parameters']['persistent_history_file'] = ''
-    config['AWS Access']['aws_access_key_id'] = ''
-    config['AWS Access']['aws_secret_access_key'] = ''
+    config.set('Shell Parameters', 'persistent_history_file', '')
+    config.set('AWS Access','aws_access_key_id', '')
+    config.set('AWS Access','aws_secret_access_key', '')
     server = control.ExperimentServerController(config)
 
     launch_in_sandbox_mode = True
@@ -38,9 +38,10 @@ def test_awscreds_notset(capfd):
     
     config = PsiturkConfig()
     config.load_config()
-    config['Shell Parameters']['persistent_history_file'] = ''
-    config['AWS Access']['aws_access_key_id'] = 'YourAccessKeyId'
-    config['AWS Access']['aws_secret_access_key'] = 'YourSecretAccessKey'
+    config.set('Shell Parameters', 'persistent_history_file', '')
+    config.set('AWS Access','aws_access_key_id', 'YourAccessKeyId')
+    config.set('AWS Access','aws_secret_access_key', 'YourSecretAccessKey')
+    
     server = control.ExperimentServerController(config)
 
     launch_in_sandbox_mode = True