Pruned helper_random and removed import from pyelliptic

Author: g1itch

src/helper_random.py

@@ -1,74 +1,14 @@
-"""Convenience functions for random operations. Not suitable for security / cryptography operations."""
+"""Keep all imports from random in one place"""
 
-import os
-import random
 
-try:
-    from pyelliptic.openssl import OpenSSL
-except ImportError:
-    from .pyelliptic.openssl import OpenSSL
+from random import seed
+from random import shuffle as randomshuffle
+from random import sample as randomsample
+from random import randrange as randomrandrange
+from random import choice as randomchoice
+from highlevelcrypto import randomBytes
 
-NoneType = type(None)
-
-
-def seed():
-    """Initialize random number generator"""
-    random.seed()
-
-
-def randomBytes(n):
-    """Method randomBytes."""
-    try:
-        return os.urandom(n)
-    except NotImplementedError:
-        return OpenSSL.rand(n)
-
-
-def randomshuffle(population):
-    """Method randomShuffle.
-
-    shuffle the sequence x in place.
-    shuffles the elements in list in place,
-    so they are in a random order.
-    As Shuffle will alter data in-place,
-    so its input must be a mutable sequence.
-    In contrast, sample produces a new list
-    and its input can be much more varied
-    (tuple, string, xrange, bytearray, set, etc)
-    """
-    random.shuffle(population)
-
-
-def randomsample(population, k):
-    """Method randomSample.
-
-    return a k length list of unique elements
-    chosen from the population sequence.
-    Used for random sampling
-    without replacement, its called
-    partial shuffle.
-    """
-    return random.sample(population, k)
-
-
-def randomrandrange(x, y=None):
-    """Method randomRandrange.
-
-    return a randomly selected element from
-    range(start, stop). This is equivalent to
-    choice(range(start, stop)),
-    but doesnt actually build a range object.
-    """
-    if isinstance(y, NoneType):
-        return random.randrange(x)  # nosec
-    return random.randrange(x, y)  # nosec
-
-
-def randomchoice(population):
-    """Method randomchoice.
-
-    Return a random element from the non-empty
-    sequence seq. If seq is empty, raises
-    IndexError.
-    """
-    return random.choice(population)  # nosec
+__all__ = [
+    'seed', 'randomBytes', 'randomshuffle', 'randomsample', 'randomrandrange',
+    'randomchoice'
+]

src/highlevelcrypto.py

@@ -7,13 +7,22 @@
   `More discussion. <https://github.com/yann2192/pyelliptic/issues/32>`_
 """
 
+import os
 from binascii import hexlify
 
 import pyelliptic
 from pyelliptic import OpenSSL
 from pyelliptic import arithmetic as a
 
 
+def randomBytes(n):
+    """Get n random bytes"""
+    try:
+        return os.urandom(n)
+    except NotImplementedError:
+        return OpenSSL.rand(n)
+
+
 def makeCryptor(privkey):
     """Return a private `.pyelliptic.ECC` instance"""
     private_key = a.changebase(privkey, 16, 256, minlen=32)