encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 17:09:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Addressed review comments

Browse Source
This commit is contained in:
mizvyt 2019-10-01 19:46:30 +08:00
parent c297600fb9
commit 7f5833ac21
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api-guide/throttling.md
View File

@ -41,7 +41,7 @@ The default throttling policy may be set globally, using the `DEFAULT_THROTTLE_C
}
}
The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period. To set the rate to a fraction of a period, simply prepend the desired timespan. For example, a rate of `'100/30s'` will mean "limit requests to a maximum of 100 per every 30 seconds".
The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period. The throttle period can optionally include a number, too. For example, a rate of `100 / 30 seconds` will mean "limit requests to a maximum of 100 per every 30 seconds".
You can also set the throttling policy on a per-view or per-viewset basis,
using the `APIView` class-based views.

3
rest_framework/throttling.py
View File

@ -106,7 +106,8 @@ class SimpleRateThrottle(BaseThrottle):
try:
num, period = rate.split('/')
num_requests = int(num)
period_timescale = re.findall(r'^\d*[s|m|h|d]', period)[0]
period_timescale = re.findall(r'^\d*[s|m|h|d]',
''.join(period.split()))[0]
period_char = period_timescale[-1]
except (ValueError, IndexError):
msg = "Incorrect throttle rate set for '%s' scope" % self.scope

10
tests/test_throttling.py
View File

@ -503,10 +503,16 @@ class SimpleRateThrottleTests(TestCase):
rate = SimpleRateThrottle().parse_rate(rate_str)
assert rate == (100, 30)
SimpleRateThrottle.rate = '100/10d'
rate = SimpleRateThrottle().parse_rate('100/10d')
rate_str = '100/10d'
SimpleRateThrottle.rate = rate_str
rate = SimpleRateThrottle().parse_rate(rate_str)
assert rate == (100, 10 * 86400)
rate_str = '100 / 36 hours'
SimpleRateThrottle.rate = rate_str
rate = SimpleRateThrottle().parse_rate(rate_str)
assert rate == (100, 36 * 3600)
def test_parse_rate_returns_tuple_with_none_if_rate_not_provided(self):
rate = SimpleRateThrottle().parse_rate(None)
assert rate == (None, None)