diff options
Diffstat (limited to 'libpathod/language')
| -rw-r--r-- | libpathod/language/__init__.py | 2 | ||||
| -rw-r--r-- | libpathod/language/actions.py | 4 | ||||
| -rw-r--r-- | libpathod/language/base.py | 16 | ||||
| -rw-r--r-- | libpathod/language/http2.py | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libpathod/language/__init__.py b/libpathod/language/__init__.py index 10050bf8..4b06f7e4 100644 --- a/libpathod/language/__init__.py +++ b/libpathod/language/__init__.py @@ -13,7 +13,7 @@ assert Settings # prevent pyflakes from messing with this def expand(msg): times = getattr(msg, "times", None) if times: - for j in xrange(int(times.value)): + for j_ in xrange(int(times.value)): yield msg.strike_token("times") else: yield msg diff --git a/libpathod/language/actions.py b/libpathod/language/actions.py index f825d0cc..7bb61005 100644 --- a/libpathod/language/actions.py +++ b/libpathod/language/actions.py @@ -71,7 +71,7 @@ class PauseAt(_Action): def intermediate(self, settings): return (self.offset, "pause", self.seconds) - def freeze(self, settings): + def freeze(self, settings_): return self @@ -91,7 +91,7 @@ class DisconnectAt(_Action): def intermediate(self, settings): return (self.offset, "disconnect") - def freeze(self, settings): + def freeze(self, settings_): return self diff --git a/libpathod/language/base.py b/libpathod/language/base.py index 726580fc..1f42f65e 100644 --- a/libpathod/language/base.py +++ b/libpathod/language/base.py @@ -86,7 +86,7 @@ class Token(object): """ return self.__class__.__name__.lower() - def resolve(self, settings, msg): + def resolve(self, settings_, msg_): """ Resolves this token to ready it for transmission. This means that the calculated offsets of actions are fixed. @@ -104,10 +104,10 @@ class _TokValueLiteral(Token): def __init__(self, val): self.val = val.decode("string_escape") - def get_generator(self, settings): + def get_generator(self, settings_): return self.val - def freeze(self, settings): + def freeze(self, settings_): return self @@ -150,7 +150,7 @@ class TokValueGenerate(Token): def bytes(self): return self.usize * utils.SIZE_UNITS[self.unit] - def get_generator(self, settings): + def get_generator(self, settings_): return generators.RandomGenerator(self.datatype, self.bytes()) def freeze(self, settings): @@ -194,7 +194,7 @@ class TokValueFile(Token): e = e + v_naked_literal return e.setParseAction(lambda x: cls(*x)) - def freeze(self, settings): + def freeze(self, settings_): return self def get_generator(self, settings): @@ -310,7 +310,7 @@ class CaselessLiteral(_Component): def spec(self): return self.TOK - def freeze(self, settings): + def freeze(self, settings_): return self @@ -390,7 +390,7 @@ class Integer(_Component): def spec(self): return "%s%s" % (self.preamble, self.value) - def freeze(self, settings): + def freeze(self, settings_): return self @@ -476,7 +476,7 @@ class Boolean(_Component): e = pp.Optional(pp.Literal("-"), default=True) e += pp.Literal(cls.name).suppress() - def parse(s, loc, toks): + def parse(s_, loc_, toks): val = True if toks[0] == "-": val = False diff --git a/libpathod/language/http2.py b/libpathod/language/http2.py index b13d50de..86e04056 100644 --- a/libpathod/language/http2.py +++ b/libpathod/language/http2.py @@ -1,5 +1,5 @@ import pyparsing as pp -from . import base, actions, message +from . import base, message """ Normal HTTP requests: |