diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:01 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:01 +1200 |
| commit | a061e4587772f4a87eb43d84f2ed358f7cc98fbd (patch) | |
| tree | 1aba05c9d0d6f654fe946897dcb8b5d9127a3de2 /pathod/language | |
| parent | 06703542037d1c84b0dcb60c6d1c500a0d189e93 (diff) | |
| parent | a7abf8b731658b4e7ed8705f7a94a6a62f08d51d (diff) | |
| download | mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.tar.gz mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.tar.bz2 mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.zip | |
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'pathod/language')
| -rw-r--r-- | pathod/language/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pathod/language/base.py b/pathod/language/base.py index 54ca6492..97111ed6 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -5,8 +5,8 @@ import pyparsing as pp from six.moves import reduce from netlib.utils import escaped_str_to_bytes, bytes_to_escaped_str +from netlib import human -from .. import utils from . import generators, exceptions @@ -158,7 +158,7 @@ class TokValueGenerate(Token): self.usize, self.unit, self.datatype = usize, unit, datatype def bytes(self): - return self.usize * utils.SIZE_UNITS[self.unit] + return self.usize * human.SIZE_UNITS[self.unit] def get_generator(self, settings_): return generators.RandomGenerator(self.datatype, self.bytes()) @@ -173,7 +173,7 @@ class TokValueGenerate(Token): u = reduce( operator.or_, - [pp.Literal(i) for i in utils.SIZE_UNITS.keys()] + [pp.Literal(i) for i in human.SIZE_UNITS.keys()] ).leaveWhitespace() e = e + pp.Optional(u, default=None) |