X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Frand.py;h=4bc073a1ceb63f727d6022e5586d85d577084dbf;hb=5eb6b4548beeacbd191b9c49a9b6cb7acf339837;hp=e8d7d957ce3ae5ee51fa0c715467cfd35b757542;hpb=72a7754bfee5206288d9211b740dae7b2ca9618b;p=oss%2Fctypescrypto.git diff --git a/ctypescrypto/rand.py b/ctypescrypto/rand.py index e8d7d95..4bc073a 100644 --- a/ctypescrypto/rand.py +++ b/ctypescrypto/rand.py @@ -19,11 +19,11 @@ def bytes( num, check_result=False): """ if num <= 0 : - raise ValueError, "'num' should be > 0" + raise ValueError("'num' should be > 0") buffer = create_string_buffer(num) result = libcrypto.RAND_bytes(buffer, num) if check_result and result == 0: - raise RandError, "Random Number Generator not seeded sufficiently" + raise RandError("Random Number Generator not seeded sufficiently") return buffer.raw[:num] def pseudo_bytes(num): @@ -36,7 +36,7 @@ def pseudo_bytes(num): not for key generation etc. """ if num <= 0 : - raise ValueError, "'num' should be > 0" + raise ValueError("'num' should be > 0") buffer = create_string_buffer(num) libcrypto.RAND_pseudo_bytes(buffer, num) return buffer.raw[:num] @@ -47,8 +47,8 @@ def seed(data, entropy=None): If entropy is not None, it should be floating point(double) value estimating amount of entropy in the data (in bytes). """ - if type(data) != type(""): - raise TypeError, "A string is expected" + if not isinstance(data,str): + raise TypeError("A string is expected") ptr = c_char_p(data) size = len(data) if entropy is None: