diff options
Diffstat (limited to 'kpov_judge/kpov_random_helpers.py')
| -rwxr-xr-x | kpov_judge/kpov_random_helpers.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kpov_judge/kpov_random_helpers.py b/kpov_judge/kpov_random_helpers.py index 5fb2593..491e7ce 100755 --- a/kpov_judge/kpov_random_helpers.py +++ b/kpov_judge/kpov_random_helpers.py @@ -12,8 +12,8 @@ import glob import os def alnum_gen(r, l=1): - s = u"" - for i in xrange(l): + s = "" + for i in range(l): s += r.choice(string.ascii_letters + string.digits) return s @@ -70,8 +70,8 @@ def IPv4_net_gen(r, min_hosts=254, local=True, multicast=False): def IPv4_addr_gen(r, network, n_generated=1, reserve_top=1, reserve_bottom=1): net, mask = _net_to_int(network) hosts = [] - l = r.sample(xrange(reserve_bottom, - 2**(32 - mask)-reserve_top), n_generated) + l = r.sample(list(range(reserve_bottom, + 2**(32 - mask)-reserve_top)), n_generated) for i in l: hosts.append(socket.inet_ntoa(struct.pack('>I', net | i))) return hosts @@ -79,7 +79,7 @@ def IPv4_addr_gen(r, network, n_generated=1, reserve_top=1, reserve_bottom=1): def MAC_gen(r): s = "0123456789ABCDEF" return ":".join([r.choice(s) + r.choice("26AE")] + \ - [r.choice(s) + r.choice(s) for i in xrange(5)]) + [r.choice(s) + r.choice(s) for i in range(5)]) common_file_extensions = ['jpg', 'png', 'txt', 'doc', 'cfg', 'pdf', 'odt', 'cpp', 'c', 'sh', 'java'] def fname_gen(r, extension = True): @@ -131,7 +131,7 @@ default_generators = { def default_gen(userID, param_meta): r = random.Random(userID) params = dict() - for name, meta in param_meta.iteritems(): + for name, meta in param_meta.items(): if meta.get('generated', False): params[name] = default_generators.get( meta.get('type', None), unknown_generator)(r) @@ -139,6 +139,6 @@ def default_gen(userID, param_meta): if __name__ == '__main__': r = random.Random() - for k, v in default_generators.iteritems(): - print ("---{}---".format(k)) - print (v(r)) + for k, v in default_generators.items(): + print("---{}---".format(k)) + print(v(r)) |