diff options
| author | Philip Douglas | 2013-08-16 07:15:09 -0700 |
|---|---|---|
| committer | Philip Douglas | 2013-08-16 07:15:09 -0700 |
| commit | ef7ce344865938bea285a408a7cc415a7b90a83c (patch) | |
| tree | 1bfa78c86e422f81cf836319d91c626c763d5b24 /rest_framework/views.py | |
| parent | c058ab36b13a6979c57760d9af2eb21ec3165e7d (diff) | |
| parent | c1ccd8b5b5aef1bd209862f9431c9c03e25ae755 (diff) | |
| download | django-rest-framework-ef7ce344865938bea285a408a7cc415a7b90a83c.tar.bz2 | |
Merge pull request #3 from tomchristie/master
Update to latest
Diffstat (limited to 'rest_framework/views.py')
| -rw-r--r-- | rest_framework/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/views.py b/rest_framework/views.py index 37bba7f0..d51233a9 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -269,7 +269,7 @@ class APIView(View): Handle any exception that occurs, by returning an appropriate response, or re-raising the error. """ - if isinstance(exc, exceptions.Throttled): + if isinstance(exc, exceptions.Throttled) and exc.wait is not None: # Throttle wait header self.headers['X-Throttle-Wait-Seconds'] = '%d' % exc.wait |