Update checked in version of gsutil to version 4.6

gslib/exception.py

+# -*- coding: utf-8 -*-
 # Copyright 2010 Google 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-
 # lowing conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
-
 """gsutil exceptions.
 
 The exceptions in this module are for use across multiple different classes.
 """
 
+from __future__ import absolute_import
+
 
 class AbortException(StandardError):
   """Exception raised when a user aborts a command that needs to do cleanup."""
 
   def __init__(self, reason):
     StandardError.__init__(self)
     self.reason = reason
 
   def __repr__(self):
     return 'AbortException: %s' % self.reason
@@ skipping 16 matching lines @@
 
     Args:
       reason: Text describing the problem.
       informational: Indicates reason should be printed as FYI, not a failure.
     """
     StandardError.__init__(self)
     self.reason = reason
     self.informational = informational
 
   def __repr__(self):
-    return 'CommandException: %s' % self.reason
+    return str(self)
 
   def __str__(self):
     return 'CommandException: %s' % self.reason
 
 
-class ProjectIdException(StandardError):
+class InvalidUrlError(Exception):
+  """Exception raised when URL is invalid."""
 
-  def __init__(self, reason):
-    StandardError.__init__(self)
-    self.reason = reason
+  def __init__(self, message):
+    Exception.__init__(self, message)
+    self.message = message
 
   def __repr__(self):
-    return 'ProjectIdException: %s' % self.reason
+    return str(self)
 
   def __str__(self):
-    return 'ProjectIdException: %s' % self.reason
+    return 'InvalidUrlError: %s' % self.message