Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

boto/mturk/connection.py

 # Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 542 matching lines @@
            once.
 
         test: a QuestionForm
 
         answer_key: an XML string of your answer key, for automatically
            scored qualification tests.
            (Consider implementing an AnswerKey class for this to support.)
 
         test_duration: the number of seconds a worker has to complete the test.
 
-        auto_granted: if True, requests for the Qualification are granted immediately.
-          Can't coexist with a test.
+        auto_granted: if True, requests for the Qualification are granted
+           immediately.  Can't coexist with a test.
 
         auto_granted_value: auto_granted qualifications are given this value.
 
         """
 
         params = {'Name' : name,
                   'Description' : description,
                   'QualificationTypeStatus' : status,
                   }
         if retry_delay is not None:
-            params['RetryDelay'] = retry_delay
+            params['RetryDelayInSeconds'] = retry_delay
 
         if test is not None:
             assert(isinstance(test, QuestionForm))
             assert(test_duration is not None)
             params['Test'] = test.get_as_xml()
 
         if test_duration is not None:
             params['TestDurationInSeconds'] = test_duration
 
         if answer_key is not None:
@@ skipping 36 matching lines @@
 
         params = {'QualificationTypeId' : qualification_type_id }
 
         if description is not None:
             params['Description'] = description
 
         if status is not None:
             params['QualificationTypeStatus'] = status
 
         if retry_delay is not None:
-            params['RetryDelay'] = retry_delay
+            params['RetryDelayInSeconds'] = retry_delay
 
         if test is not None:
             assert(isinstance(test, QuestionForm))
             params['Test'] = test.get_as_xml()
 
         if test_duration is not None:
             params['TestDuration'] = test_duration
 
         if answer_key is not None:
             if isinstance(answer_key, basestring):
@@ skipping 262 matching lines @@
         self.fields = []
         self.qid = None
 
     def endElement(self, name, value, connection):
         if name == 'QuestionIdentifier':
             self.qid = value
         elif name in ['FreeText', 'SelectionIdentifier', 'OtherSelectionText'] and self.qid:
             self.fields.append((self.qid,value))
         elif name == 'Answer':
             self.qid = None