@@ -41,7 +41,7 @@ except ImportError:

 ## s3cmd exceptions

 class S3Exception(Exception):

-    def __init__(self, message = ""):

+    def __init__(self, message=""):

         self.message = S3.Utils.unicodise(message)

     def __str__(self):

@@ -58,6 +58,7 @@ class S3Exception(Exception):

     ## (Base)Exception.message has been deprecated in Python 2.6

     def _get_message(self):

         return self._message

+

     def _set_message(self, message):

         self._message = message

     message = property(_get_message, _set_message)

@@ -68,9 +69,9 @@ class S3Error (S3Exception):

         self.status = response["status"]

         self.reason = response["reason"]

         self.info = {

-            "Code" : "",

-            "Message" : "",

-            "Resource" : ""

+            "Code": "",

+            "Message": "",

+            "Resource": ""

         }

         debug("S3Error: %s (%s)" % (self.status, self.reason))

         if "headers" in response:

@@ -114,7 +115,7 @@ class S3Error (S3Exception):

             return ExitCodes.EX_PRECONDITION

         elif self.status == 500:

             return ExitCodes.EX_SOFTWARE

-        elif self.status == 503:

+        elif self.status in [429, 503]:

             return ExitCodes.EX_SERVICE

         else:

             return ExitCodes.EX_SOFTWARE

@@ -1422,7 +1422,7 @@ class S3(object):

         if response["status"] == 405: # Method Not Allowed.  Don't retry.

             raise S3Error(response)

-        if response["status"] >= 500:

+        if response["status"] >= 500 or response["status"] == 429:

             e = S3Error(response)

             if response["status"] == 501:

@@ -1663,11 +1663,16 @@ class S3(object):

         if response["status"] < 200 or response["status"] > 299:

             try_retry = False

             if response["status"] >= 500:

-                ## AWS internal error - retry

+                # AWS internal error - retry

                 try_retry = True

                 if response["status"] == 503:

                     ## SlowDown error

                     throttle = throttle and throttle * 5 or 0.01

+            elif response["status"] == 429:

+                # Not an AWS error, but s3 compatible server possible error:

+                # TooManyRequests/Busy/slowdown

+                try_retry = True

+                throttle = throttle and throttle * 5 or 0.01

             elif response["status"] >= 400:

                 err = S3Error(response)

                 ## Retriable client error?