From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 2 May 2012 01:20:44 +0000 (-0700)
Subject: replace utils.randombytes with os.urandom
X-Git-Tag: v0.13.0~14^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f25827c5b66450482fad8209f38ca77664f504dd;p=services%2Fpython-requests.git

replace utils.randombytes with os.urandom
---

diff --git a/requests/auth.py b/requests/auth.py
index e636b72..cb851d2 100644
--- a/requests/auth.py
+++ b/requests/auth.py
@@ -7,13 +7,14 @@ requests.auth
 This module contains the authentication handlers for Requests.
 """
 
+import os
 import time
 import hashlib
 
 from base64 import b64encode
 
 from .compat import urlparse, str
-from .utils import randombytes, parse_dict_header
+from .utils import parse_dict_header
 
 try:
     from oauthlib.oauth1.rfc5849 import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER)
@@ -192,7 +193,7 @@ class HTTPDigestAuth(AuthBase):
                 s = str(nonce_count).encode('utf-8')
                 s += nonce.encode('utf-8')
                 s += time.ctime().encode('utf-8')
-                s += randombytes(8)
+                s += os.urandom(8)
 
                 cnonce = (hashlib.sha1(s).hexdigest()[:16])
                 noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, hash_utf8(A2))
diff --git a/requests/utils.py b/requests/utils.py
index 8365cc3..e60b9c4 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -12,14 +12,12 @@ that are also useful for external consumption.
 import cgi
 import codecs
 import os
-import random
 import re
 import zlib
 from netrc import netrc, NetrcParseError
 
 from .compat import parse_http_list as _parse_list_header
-from .compat import quote, is_py2, urlparse
-from .compat import basestring, bytes, str
+from .compat import quote, urlparse, basestring, bytes, str
 from .cookies import RequestsCookieJar, cookiejar_from_dict
 
 _hush_pyflakes = (RequestsCookieJar,)
@@ -248,15 +246,6 @@ def header_expand(headers):
     return ''.join(collector)
 
 
-def randombytes(n):
-    """Return n random bytes."""
-    if is_py2:
-        L = [chr(random.randrange(0, 256)) for i in range(n)]
-    else:
-        L = [chr(random.randrange(0, 256)).encode('utf-8') for i in range(n)]
-    return b"".join(L)
-
-
 def dict_from_cookiejar(cj):
     """Returns a key/value dictionary from a CookieJar.