From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 20 Oct 2011 15:42:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: v0.7.0~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d0e03ce419249e58fca1ffb4aa4da1a53b27203;p=services%2Fpython-requests.git

Merge remote-tracking branch 'origin/develop' into develop
---

8d0e03ce419249e58fca1ffb4aa4da1a53b27203
diff --cc requests/status_codes.py
index aa52b9f,b49c3c1..fab8e95
--- a/requests/status_codes.py
+++ b/requests/status_codes.py
@@@ -53,9 -53,12 +53,12 @@@ _codes = 
      418: ('im_a_teapot', 'teapot', 'i_am_a_teapot'),
      422: ('unprocessable_entity', 'unprocessable'),
      423: ('locked',),
 -    424: ('failed_depdendency', 'depdendency'),
 +    424: ('failed_dependency', 'dependency'),
      425: ('unordered_collection', 'unordered'),
      426: ('upgrade_required', 'upgrade'),
+     428: ('precondition_required', 'precondition'),
+     429: ('too_many_requests', 'too_many'),
+     431: ('header_fields_too_large', 'fields_too_large'),
      444: ('no_response', 'none'),
      449: ('retry_with', 'retry'),
      450: ('blocked_by_windows_parental_controls', 'parental_controls'),