From a04d7fd166498b54316571a4e71a58837cf11df8 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 2 Jun 2016 12:59:14 +0530 Subject: Py3: Return bytes from RandomGenerator and use __getitem__ rather than __getslice__ --- pathod/language/generators.py | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'pathod/language') diff --git a/pathod/language/generators.py b/pathod/language/generators.py index a17e7052..fdba1ab2 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -3,16 +3,16 @@ import random import mmap DATATYPES = dict( - ascii_letters=string.ascii_letters, - ascii_lowercase=string.ascii_lowercase, - ascii_uppercase=string.ascii_uppercase, - digits=string.digits, - hexdigits=string.hexdigits, - octdigits=string.octdigits, - punctuation=string.punctuation, - whitespace=string.whitespace, - ascii=string.printable, - bytes="".join(chr(i) for i in range(256)) + ascii_letters=string.ascii_letters.encode(), + ascii_lowercase=string.ascii_lowercase.encode(), + ascii_uppercase=string.ascii_uppercase.encode(), + digits=string.digits.encode(), + hexdigits=string.hexdigits.encode(), + octdigits=string.octdigits.encode(), + punctuation=string.punctuation.encode(), + whitespace=string.whitespace.encode(), + ascii=string.printable.encode(), + bytes=bytes(bytearray(range(256))) ) @@ -45,6 +45,15 @@ class TransformGenerator(object): return "'transform(%s)'" % self.gen +def rand_byte(chars): + """ + Return a random character as byte from a charset. + """ + # bytearray has consistent behaviour on both Python 2 and 3 + # while bytes does not + return bytes(bytearray([random.choice(chars)])) + + class RandomGenerator(object): def __init__(self, dtype, length): @@ -55,12 +64,10 @@ class RandomGenerator(object): return self.length def __getitem__(self, x): - return random.choice(DATATYPES[self.dtype]) - - def __getslice__(self, a, b): - b = min(b, self.length) chars = DATATYPES[self.dtype] - return "".join(random.choice(chars) for x in range(a, b)) + if isinstance(x, slice): + return b"".join(rand_byte(chars) for _ in range(*x.indices(self.length))) + return rand_byte(chars) def __repr__(self): return "%s random from %s" % (self.length, self.dtype) -- cgit v1.2.3 From b510616c69135ff2e8f18da3a5fd9a19ddcdfc63 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 2 Jun 2016 13:00:44 +0530 Subject: Py3: Return bytes from FileGenerator and use __getitem__ instead of __getslice__ --- pathod/language/generators.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pathod/language') diff --git a/pathod/language/generators.py b/pathod/language/generators.py index fdba1ab2..bbad3d18 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -77,17 +77,17 @@ class FileGenerator(object): def __init__(self, path): self.path = path - self.fp = file(path, "rb") + self.fp = open(path, "rb") self.map = mmap.mmap(self.fp.fileno(), 0, access=mmap.ACCESS_READ) def __len__(self): return len(self.map) def __getitem__(self, x): - return self.map.__getitem__(x) - - def __getslice__(self, a, b): - return self.map.__getslice__(a, b) + if isinstance(x, slice): + return self.map.__getitem__(x) + # A slice of length 1 returns a byte object (not an integer) + return self.map.__getitem__(slice(x, x+1 or self.map.size())) def __repr__(self): return "<%s" % self.path -- cgit v1.2.3 From ec5d931ee3f4760b250de000ed005c73d17af462 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 2 Jun 2016 13:02:17 +0530 Subject: Remove redundant __getslice__ from TransformGenerator --- pathod/language/generators.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pathod/language') diff --git a/pathod/language/generators.py b/pathod/language/generators.py index bbad3d18..e736e043 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -37,10 +37,6 @@ class TransformGenerator(object): d = self.gen.__getitem__(x) return self.transform(x, d) - def __getslice__(self, a, b): - d = self.gen.__getslice__(a, b) - return self.transform(a, d) - def __repr__(self): return "'transform(%s)'" % self.gen -- cgit v1.2.3 From 75ce2498e8c98ec3fd6583985990a56eeb03f2b8 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Thu, 2 Jun 2016 13:34:18 +0530 Subject: Simplify rand_byte by creating a special case for Python 2 --- pathod/language/generators.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pathod/language') diff --git a/pathod/language/generators.py b/pathod/language/generators.py index e736e043..20bb7ae1 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -2,6 +2,8 @@ import string import random import mmap +import six + DATATYPES = dict( ascii_letters=string.ascii_letters.encode(), ascii_lowercase=string.ascii_lowercase.encode(), @@ -47,7 +49,9 @@ def rand_byte(chars): """ # bytearray has consistent behaviour on both Python 2 and 3 # while bytes does not - return bytes(bytearray([random.choice(chars)])) + if six.PY2: + return random.choice(chars) + return bytes([random.choice(chars)]) class RandomGenerator(object): -- cgit v1.2.3 From 5e385405ca38aec56575be688d4906036f3bb650 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 2 Jun 2016 09:54:19 -0700 Subject: please flake8 --- pathod/language/generators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pathod/language') diff --git a/pathod/language/generators.py b/pathod/language/generators.py index 20bb7ae1..01f709e2 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -87,7 +87,7 @@ class FileGenerator(object): if isinstance(x, slice): return self.map.__getitem__(x) # A slice of length 1 returns a byte object (not an integer) - return self.map.__getitem__(slice(x, x+1 or self.map.size())) + return self.map.__getitem__(slice(x, x + 1 or self.map.size())) def __repr__(self): return "<%s" % self.path -- cgit v1.2.3 From 8e60a9bca9a14a9b3393b82927c56cdb13e1e8c8 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Fri, 3 Jun 2016 02:00:58 +0530 Subject: Handle the slice object case in TransformGenerator.__getitem__ --- pathod/language/generators.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pathod/language') diff --git a/pathod/language/generators.py b/pathod/language/generators.py index 01f709e2..9fff3082 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -37,6 +37,8 @@ class TransformGenerator(object): def __getitem__(self, x): d = self.gen.__getitem__(x) + if isinstance(x, slice): + return self.transform(x.start, d) return self.transform(x, d) def __repr__(self): -- cgit v1.2.3