From d23c4b94c11eadfba7554fa7216f2a30b04396ca Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 23 Oct 2011 11:00:36 -0400
Subject: [PATCH] httpbasic authentication cleanup

---
 requests/auth.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/requests/auth.py b/requests/auth.py
index 900a048..0a0402b 100644
--- a/requests/auth.py
+++ b/requests/auth.py
@@ -7,15 +7,17 @@ requests.auth
 This module contains the authentication handlers for Requests.
 """
 
-from base64 import encodestring as base64
+from base64 import base64
 
 def http_basic(r, username, password):
     """Attaches HTTP Basic Authentication to the given Request object.
     Arguments should be considered non-positional.
 
     """
+    username = str(username)
+    password = str(password)
 
-    auth_s = base64('%s:%s' % (username, password)).replace('\n', '')
+    auth_s = base64('%s:%s' % (username, password))
     r.headers['Authorization'] = ('Basic %s' % auth_s)
 
     return r
-- 
2.7.4