Upgrade gsutil to 3.4

third_party/gsutil/boto/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 23 matching lines @@
 
 class MTurkRequestError(EC2ResponseError):
     "Error for MTurk Requests"
     # todo: subclass from an abstract parent of EC2ResponseError
 
 class MTurkConnection(AWSQueryConnection):
     
     APIVersion = '2008-08-02'
     
     def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
-                 is_secure=False, port=None, proxy=None, proxy_port=None,
+                 is_secure=True, port=None, proxy=None, proxy_port=None,
                  proxy_user=None, proxy_pass=None,
                  host=None, debug=0,
                  https_connection_factory=None):
         if not host:
             if config.has_option('MTurk', 'sandbox') and config.get('MTurk', 'sandbox') == 'True':
                 host = 'mechanicalturk.sandbox.amazonaws.com'
             else:
                 host = 'mechanicalturk.amazonaws.com'
 
         AWSQueryConnection.__init__(self, aws_access_key_id,
@@ skipping 32 matching lines @@
         if keywords:
             params['Keywords'] = self.get_keywords_as_string(keywords)
 
         if approval_delay is not None:
             d = self.duration_as_seconds(approval_delay)
             params['AutoApprovalDelayInSeconds'] = d
 
         if qual_req is not None:
             params.update(qual_req.get_as_params())
 
-        return self._process_request('RegisterHITType', params)
+        return self._process_request('RegisterHITType', params, [('HITTypeId', HITTypeId)])
+
 
     def set_email_notification(self, hit_type, email, event_types=None):
         """
         Performs a SetHITTypeNotification operation to set email
         notification for a specified HIT type
         """
         return self._set_notification(hit_type, 'Email', email, event_types)
     
     def set_rest_notification(self, hit_type, url, event_types=None):
         """
@@ skipping 445 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:
             if isinstance(answer_key, basestring):
                 params['AnswerKey'] = answer_key # xml
             else:
                 raise TypeError
                 # Eventually someone will write an AnswerKey class.
 
         if auto_granted:
-            assert(test is False)
+            assert(test is None)
             params['AutoGranted'] = True
             params['AutoGrantedValue'] = auto_granted_value
 
         if keywords:
             params['Keywords'] = self.get_keywords_as_string(keywords)
 
         return self._process_request('CreateQualificationType', params,
                                      [('QualificationType', QualificationType),])
 
     def get_qualification_type(self, qualification_type_id):
@@ skipping 18 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
+            params['TestDurationInSeconds'] = test_duration
 
         if answer_key is not None:
             if isinstance(answer_key, basestring):
                 params['AnswerKey'] = answer_key # xml
             else:
                 raise TypeError
                 # Eventually someone will write an AnswerKey class.
 
         if auto_granted is not None:
             params['AutoGranted'] = auto_granted
@@ skipping 163 matching lines @@
             now = datetime.datetime.utcnow()
             expiration = datetime.datetime.strptime(self.Expiration, '%Y-%m-%dT%H:%M:%SZ')
             expired = (now >= expiration)
         else:
             raise ValueError("ERROR: Request for expired property, but no Expiration in HIT!")
         return expired
 
     # are we there yet?
     expired = property(_has_expired)
 
+class HITTypeId(BaseAutoResultElement):
+    """
+    Class to extract an HITTypeId structure from a response 
+    """
+
+    pass
+
 class Qualification(BaseAutoResultElement):
     """
     Class to extract an Qualification structure from a response (used in
     ResultSet)
     
     Will have attributes named as per the Developer Guide such as
     QualificationTypeId, IntegerValue. Does not seem to contain GrantTime.
     """
     
     pass
@@ skipping 68 matching lines @@
     """
 
     def __init__(self, connection):
         BaseAutoResultElement.__init__(self, connection)
         self.fields = []
         self.qid = None
 
     def endElement(self, name, value, connection):
         if name == 'QuestionIdentifier':
             self.qid = value
-        elif name in ['FreeText', 'SelectionIdentifier'] and self.qid:
-            self.fields.append((self.qid,value))
-        elif name == 'Answer':
-            self.qid = None
+        elif name in ['FreeText', 'SelectionIdentifier', 'OtherSelectionText'] and self.qid:
+            self.fields.append( value )