Upgrade gsutil to 3.4

third_party/gsutil/boto/boto/mturk/question.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 278 matching lines @@
     
     def get_as_xml(self):
         num_lines = self.num_lines
         return self.template % vars()
     
 class FreeTextAnswer(object):
     template = '<FreeTextAnswer>%(items)s</FreeTextAnswer>'
 
     def __init__(self, default=None, constraints=None, num_lines=None):
         self.default = default
-        if constraints is None: constraints = Constraints()
-        self.constraints = Constraints(constraints)
+        if constraints is None:
+            self.constraints = Constraints()
+        else:
+            self.constraints = Constraints(constraints)
         self.num_lines = num_lines
     
     def get_as_xml(self):
-        constraints = Constraints()
-        items = [constraints]
+        items = [self.constraints]
         if self.default:
             items.append(SimpleField('DefaultText', self.default))
         if self.num_lines:
             items.append(NumberOfLinesSuggestion(self.num_lines))
         items = ''.join(item.get_as_xml() for item in items)
         return self.template % vars()
 
 class FileUploadAnswer(object):
-    template = """<FileUploadAnswer><MinFileSizeInBytes>%(min_bytes)d</MinFileSizeInBytes><MaxFileSizeInBytes>%(max_bytes)d</MaxFileSizeInBytes></FileUploadAnswer>"""
+    template = """<FileUploadAnswer><MaxFileSizeInBytes>%(max_bytes)d</MaxFileSizeInBytes><MinFileSizeInBytes>%(min_bytes)d</MinFileSizeInBytes></FileUploadAnswer>"""
     
     def __init__(self, min_bytes, max_bytes):
         assert 0 <= min_bytes <= max_bytes <= 2*10**9
         self.min_bytes = min_bytes
         self.max_bytes = max_bytes
     
     def get_as_xml(self):
         return self.template % vars(self)
 
 class SelectionAnswer(object):
@@ skipping 67 matching lines @@
             count_xml = SelectionAnswer.MIN_SELECTION_COUNT_XML_TEMPLATE %self.min_selections
             count_xml += SelectionAnswer.MAX_SELECTION_COUNT_XML_TEMPLATE %self.max_selections
         else:
             count_xml = ""
         
         ret = SelectionAnswer.SELECTIONANSWER_XML_TEMPLATE % (count_xml, style_xml, selections_xml)
 
         # return XML
         return ret