Upgrade gsutil to 3.4

third_party/gsutil/boto/boto/emr/instance_group.py

Index: third_party/gsutil/boto/boto/emr/instance_group.py
diff --git a/third_party/gsutil/20110627/boto/boto/gs/user.py b/third_party/gsutil/boto/boto/emr/instance_group.py
old mode 100755
new mode 100644
similarity index 52%
copy from third_party/gsutil/20110627/boto/boto/gs/user.py
copy to third_party/gsutil/boto/boto/emr/instance_group.py
index 62f2cf56d55412fbefee1ed7fda104d71d6e3de8..be229510f6cc3d43bce8dd302fcfc9d80977e47c
--- a/third_party/gsutil/20110627/boto/boto/gs/user.py
+++ b/third_party/gsutil/boto/boto/emr/instance_group.py
@@ -1,4 +1,3 @@
-# Copyright 2010 Google Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -20,35 +19,25 @@
 # IN THE SOFTWARE.
 
 
-class User:
-    def __init__(self, parent=None, id='', name=''):
-        if parent:
-            parent.owner = self
-        self.type = None
-        self.id = id
+class InstanceGroup(object):
+    def __init__(self, num_instances, role, type, market, name, bidprice=None):
+        self.num_instances = num_instances
+        self.role = role
+        self.type = type
+        self.market = market
         self.name = name
+        if market == 'SPOT':
+            if not isinstance(bidprice, basestring):
+                raise ValueError('bidprice must be specified if market == SPOT')
+            self.bidprice = bidprice
 
     def __repr__(self):
-        return self.id
-
-    def startElement(self, name, attrs, connection):
-        return None
-
-    def endElement(self, name, value, connection):
-        if name == 'Name':
-            self.name = value
-        elif name == 'ID':
-            self.id = value
-        else:
-            setattr(self, name, value)
-
-    def to_xml(self, element_name='Owner'):
-        if self.type:
-            s = '<%s type="%s">' % (element_name, self.type)
+        if self.market == 'SPOT':
+            return '%s.%s(name=%r, num_instances=%r, role=%r, type=%r, market = %r, bidprice = %r)' % (
+                self.__class__.__module__, self.__class__.__name__,
+                self.name, self.num_instances, self.role, self.type, self.market,
+                self.bidprice)
         else:
-            s = '<%s>' % element_name
-        s += '<ID>%s</ID>' % self.id
-        if self.name:
-            s += '<Name>%s</Name>' % self.name
-        s += '</%s>' % element_name
-        return s
+            return '%s.%s(name=%r, num_instances=%r, role=%r, type=%r, market = %r)' % (
+                self.__class__.__module__, self.__class__.__name__,
+                self.name, self.num_instances, self.role, self.type, self.market)