From: Eric L Frederich <eric.frederich@siemens.com>
Date: Wed, 11 Jun 2014 15:08:10 +0000 (-0400)
Subject: rename resume/resume_incomplete to permanent_redirect according to rfc7238
X-Git-Tag: v2.4.0~37^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec3a2e6f04a6e268cbae747e9f1ff6ea4217f8b2;p=services%2Fpython-requests.git

rename resume/resume_incomplete to permanent_redirect according to rfc7238

Use temporary_redirect intead of temporary_moved to make the words
line up nicely ;-)
---

diff --git a/requests/models.py b/requests/models.py
index 7bcebfd..b43901b 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -35,11 +35,11 @@ from .status_codes import codes
 #: The set of HTTP status codes that indicate an automatically
 #: processable redirect.
 REDIRECT_STATI = (
-    codes.moved,  # 301
-    codes.found,  # 302
-    codes.other,  # 303
-    codes.temporary_moved,  # 307
-    codes.resume, # 308
+    codes.moved,              # 301
+    codes.found,              # 302
+    codes.other,              # 303
+    codes.temporary_redirect, # 307
+    codes.permanent_redirect, # 308
 )
 DEFAULT_REDIRECT_LIMIT = 30
 CONTENT_CHUNK_SIZE = 10 * 1024
diff --git a/requests/sessions.py b/requests/sessions.py
index 4ec3d14..5827d91 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -146,7 +146,7 @@ class SessionRedirectMixin(object):
             prepared_request.method = method
 
             # https://github.com/kennethreitz/requests/issues/1084
-            if resp.status_code not in (codes.temporary, codes.resume):
+            if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
                 if 'Content-Length' in prepared_request.headers:
                     del prepared_request.headers['Content-Length']
 
diff --git a/requests/status_codes.py b/requests/status_codes.py
index ed7a866..9a431dd 100644
--- a/requests/status_codes.py
+++ b/requests/status_codes.py
@@ -30,7 +30,7 @@ _codes = {
     305: ('use_proxy',),
     306: ('switch_proxy',),
     307: ('temporary_redirect', 'temporary_moved', 'temporary'),
-    308: ('resume_incomplete', 'resume'),
+    308: ('permanent_redirect',),
 
     # Client Error.
     400: ('bad_request', 'bad'),