Fix type error in 429 retrying behavior with Retry-After header

Author: olzhasar-reef

b2sdk/_internal/exception.py

@@ -452,7 +452,11 @@ def __str__(self):
 class TooManyRequests(B2Error):
     def __init__(self, retry_after_seconds=None):
         super().__init__()
-        self.retry_after_seconds = retry_after_seconds
+
+        if retry_after_seconds is not None:
+            self.retry_after_seconds = int(retry_after_seconds)
+        else:
+            self.retry_after_seconds = None
 
     def __str__(self):
         return 'Too many requests'

changelog.d/+retry-after-type-error.fixed.md

@@ -0,0 +1 @@
+Fix type error in retrying behavior for 429 status with Retry-After header value set.

test/unit/b2http/test_b2http.py

@@ -344,7 +344,6 @@ def test_never_works(self, b2_http: B2Http, mock_time: MagicMock):
 
         assert mock_time.mock_calls == [call(1.0), call(1.5)]
 
-    @pytest.mark.xfail(reason='no int conversion in the retry-after header parsing logic')
     @responses.activate
     def test_too_many_requests_works_after_sleep(self, b2_http: B2Http, mock_time: MagicMock):
         _mock_error_response(self.URL, status=429, headers={'Retry-After': '2'})
@@ -353,7 +352,6 @@ def test_too_many_requests_works_after_sleep(self, b2_http: B2Http, mock_time: M
         b2_http.request(responses.GET, self.URL, {})
         mock_time.assert_called_once_with(2)
 
-    @pytest.mark.xfail(reason='no int conversion in the retry-after header parsing logic')
     @responses.activate
     def test_too_many_requests_failed_after_sleep(self, b2_http: B2Http, mock_time: MagicMock):
         _mock_error_response(self.URL, status=429, headers={'Retry-After': '2'})
@@ -363,7 +361,6 @@ def test_too_many_requests_failed_after_sleep(self, b2_http: B2Http, mock_time:
             b2_http.request(responses.GET, self.URL, {}, try_count=2)
         mock_time.assert_called_once_with(2)
 
-    @pytest.mark.xfail(reason='no int conversion in the retry-after header parsing logic')
     @responses.activate
     def test_too_many_requests_retry_header_combination_one(
         self, b2_http: B2Http, mock_time: MagicMock
@@ -377,7 +374,6 @@ def test_too_many_requests_retry_header_combination_one(
         b2_http.request(responses.GET, self.URL, {}, try_count=4)
         assert mock_time.mock_calls == [call(2), call(1.5), call(2)]
 
-    @pytest.mark.xfail(reason='no int conversion in the retry-after header parsing logic')
     @responses.activate
     def test_too_many_requests_retry_header_combination_two(
         self, b2_http: B2Http, mock_time: MagicMock