Upgrade gsutil to 3.4

third_party/gsutil/boto/boto/exception.py

 # Copyright (c) 2006-2010 Mitch Garnaat http://garnaat.org/
 # Copyright (c) 2010, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # 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-
@@ skipping 67 matching lines @@
         self.error_code = None
         self.error_message = None
         self.box_usage = None
 
         # Attempt to parse the error response. If body isn't present,
         # then just ignore the error response.
         if self.body:
             try:
                 h = handler.XmlHandler(self, self)
                 xml.sax.parseString(self.body, h)
-            except xml.sax.SAXParseException, pe:
-                # Go ahead and clean up anything that may have
-                # managed to get into the error data so we
-                # don't get partial garbage.
-                print "Warning: failed to parse error message from AWS: %s" % pe
-                self._cleanupParsedProperties()
+            except (TypeError, xml.sax.SAXParseException), pe:
+                # Remove unparsable message body so we don't include garbage
+                # in exception. But first, save self.body in self.error_message
+                # because occasionally we get error messages from Eucalyptus
+                # that are just text strings that we want to preserve.
+                self.error_message = self.body
+                self.body = None
 
     def __getattr__(self, name):
         if name == 'message':
             return self.error_message
         if name == 'code':
             return self.error_code
         raise AttributeError
 
     def __repr__(self):
         return '%s: %s %s\n%s' % (self.__class__.__name__,
@@ skipping 186 matching lines @@
             self.request_id = value
         else:
             return None # don't call subclass here
 
     def _cleanupParsedProperties(self):
         BotoServerError._cleanupParsedProperties(self)
         self._errorResultSet = []
         for p in ('errors'):
             setattr(self, p, None)
 
+class DynamoDBResponseError(BotoServerError):
+    """
+    This exception expects the fully parsed and decoded JSON response
+    body to be passed as the body parameter.
+
+    :ivar status: The HTTP status code.
+    :ivar reason: The HTTP reason message.
+    :ivar body: The Python dict that represents the decoded JSON
+        response body.
+    :ivar error_message: The full description of the AWS error encountered.
+    :ivar error_code: A short string that identifies the AWS error
+        (e.g. ConditionalCheckFailedException)
+    """
+
+    def __init__(self, status, reason, body=None, *args):
+        self.status = status
+        self.reason = reason
+        self.body = body
+        if self.body:
+            self.error_message = self.body.get('message', None)
+            self.error_code = self.body.get('__type', None)
+            if self.error_code:
+                self.error_code = self.error_code.split('#')[-1]
+
 class EmrResponseError(BotoServerError):
     """
     Error in response from EMR
     """
     pass
 
 class _EC2Error:
 
     def __init__(self, connection=None):
         self.connection = connection
@@ skipping 51 matching lines @@
         Exception.__init__(self, message)
         self.message = message
 
 class InvalidAclError(Exception):
     """Exception raised when ACL XML is invalid."""
 
     def __init__(self, message):
         Exception.__init__(self, message)
         self.message = message
 
+class InvalidCorsError(Exception):
+    """Exception raised when CORS XML is invalid."""
+
+    def __init__(self, message):
+        Exception.__init__(self, message)
+        self.message = message
+
 class NoAuthHandlerFound(Exception):
     """Is raised when no auth handlers were found ready to authenticate."""
     pass
 
 class TooManyAuthHandlerReadyToAuthenticate(Exception):
     """Is raised when there are more than one auth handler ready.
 
     In normal situation there should only be one auth handler that is ready to
     authenticate. In case where more than one auth handler is ready to
     authenticate, we raise this exception, to prevent unpredictable behavior
@@ skipping 50 matching lines @@
     """
 
     def __init__(self, message, disposition):
         Exception.__init__(self, message, disposition)
         self.message = message
         self.disposition = disposition
 
     def __repr__(self):
         return 'ResumableDownloadException("%s", %s)' % (
             self.message, self.disposition)