Merge branch '1173' into upstream-v0.6

python3android
Peter Šurda 5 years ago
commit d7cd294eb4
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87

@ -1,9 +1,11 @@
import os
import random
from pyelliptic.openssl import OpenSSL
NoneType = type(None)
def randomBytes(n):
"""Method randomBytes."""
"""Method randomBytes."""
try:
return os.urandom(n)
except NotImplementedError:
@ -30,7 +32,7 @@ def randomsample(population, k):
return random.sample(population, k)
def randomrandrange(x, y):
def randomrandrange(x, y=None):
"""Method randomRandrange.
return a randomly selected element from
@ -38,4 +40,7 @@ def randomrandrange(x, y):
choice(range(start, stop)),
but doesnt actually build a range object.
"""
return random.randrange(x, y)
if isinstance(y, NoneType):
return random.randrange(x)
else:
return random.randrange(x, y)

@ -1,6 +1,7 @@
from collections import deque
import Queue
import random
import helper_random
class MultiQueue(Queue.Queue):
defaultQueueCount = 10
@ -24,7 +25,7 @@ class MultiQueue(Queue.Queue):
# Put a new item in the queue
def _put(self, item):
#self.queue.append(item)
self.queues[random.randrange(self.queueCount)].append((item))
self.queues[helper_random.randomrandrange(self.queueCount)].append((item))
# Get an item from the queue
def _get(self):

Loading…
Cancel
Save