Fix magmaweb tests (#255)

web/magmaweb/jobquery.py

@@ -313,7 +313,7 @@ def _write_ids_file(self, params):
         ids_file.close()
 
     def _write_msfile(self, params):
-        msfile = open(os.path.join(self.dir, 'ms_data.dat'), 'wb')
+        msfile = open(os.path.join(self.dir, 'ms_data.dat'), 'w')
         if not params['ms_data_file'] is colander.null:
             msf = params['ms_data_file'].file
             msf.seek(0)

web/magmaweb/views.py

@@ -189,7 +189,7 @@ def login(self):
 
         # in anonymous mode we don't want the job status to be updated
         # by anyone so return the login form
-        is_put = self.request.method == u'PUT'
+        is_put = self.request.method == 'PUT'
         route_name = self.request.matched_route.name
         status_update = route_name == 'status.json' and is_put
 
@@ -333,13 +333,13 @@ def set_job_status(self):
         # parse job launcher request
         if self.request.content_type == 'application/json':
             status = json.loads(self.request.body)
-            if status[u'done']:
+            if status['done']:
                 jobstate = 'STOPPED'
-                hasExitCode = status[u'exitCode'] is not None
-                exitCodeErr = status[u'exitCode'] != 0
+                hasExitCode = status['exitCode'] is not None
+                exitCodeErr = status['exitCode'] != 0
                 if hasExitCode and exitCodeErr:
                     jobstate = 'ERROR'
-                if status[u'exception']:
+                if status['exception']:
                     jobstate = 'ERROR'
             else:
                 jobstate = status['state']