citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch '1173' into upstream-v0.6

Browse Source
This commit is contained in:
Peter Šurda 2018-03-21 14:14:08 +01:00
commit d7cd294eb4
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/helper_random.py
View File

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

3
src/multiqueue.py
View File

@ -1,6 +1,7 @@
from collections import deque from collections import deque
import Queue import Queue
import random import random
import helper_random
class MultiQueue(Queue.Queue): class MultiQueue(Queue.Queue):
defaultQueueCount = 10 defaultQueueCount = 10
@ -24,7 +25,7 @@ class MultiQueue(Queue.Queue):
# Put a new item in the queue # Put a new item in the queue
def _put(self, item): def _put(self, item):
#self.queue.append(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 # Get an item from the queue
def _get(self): def _get(self):