Merge branch 'master' of github.com:zopefoundation/ZEO

c3a7238f · Tres Seaver · ad1aba0e · 47cbb8d7 · c3a7238f
Commit c3a7238f authored Aug 30, 2013 by Tres Seaver
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

src/ZEO/auth/auth_digest.py src/ZEO/auth/auth_digest.py +3 -5

No files found.
--- a/src/ZEO/auth/auth_digest.py
+++ b/src/ZEO/auth/auth_digest.py
@@ -46,11 +46,9 @@ from ZEO.Exceptions import AuthError
 from ZEO.hash import sha1
 def get_random_bytes(n=8):
-    if os.path.exists("/dev/urandom"):
+    try:
-        f = open("/dev/urandom", 'rb')
+        b = os.urandom(n)
-        b = f.read(n)
+    except NotImplementedError:
-        f.close()
-    else:
        L = [chr(random.randint(0, 255)) for i in range(n)]
        b = b"".join(L)
    return b