From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 31 Aug 2011 03:58:31 +0000 (-0400)
Subject: Added Josselin Jacquard to AUTHORS
X-Git-Tag: v0.6.4^2~5^2~5^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d25fff3f93eb89a87742bf3be24fa87724fe550;p=services%2Fpython-requests.git

Added Josselin Jacquard to AUTHORS
---

diff --git a/AUTHORS b/AUTHORS
index 1eabf65..8497a09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,3 +42,4 @@ Patches and Suggestions
 - Alejandro Giacometti
 - Rick Mak
 - Johan Bergström
+- Josselin Jacquard
diff --git a/requests/utils.py b/requests/utils.py
index d21966c..27423ee 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -150,8 +150,10 @@ def get_encoding_from_headers(headers):
     """
 
     content_type = headers.get('content-type')
-    if not content_type :
-        return
+
+    if not content_type:
+        return None
+
     content_type, params = cgi.parse_header(content_type)
 
     if 'charset' in params: