diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:15 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:15 +1200 |
| commit | be644453649f0b0cf84822ad9de566b7dc744873 (patch) | |
| tree | 5d743481624d7eb15542d60bbc4909f1defeddb6 /pathod | |
| parent | a061e4587772f4a87eb43d84f2ed358f7cc98fbd (diff) | |
| parent | 898602ad21978951c65aecff7d2e49c49ca10ce2 (diff) | |
| download | mitmproxy-be644453649f0b0cf84822ad9de566b7dc744873.tar.gz mitmproxy-be644453649f0b0cf84822ad9de566b7dc744873.tar.bz2 mitmproxy-be644453649f0b0cf84822ad9de566b7dc744873.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'pathod')
| -rw-r--r-- | pathod/language/__init__.py | 3 | ||||
| -rw-r--r-- | pathod/language/base.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pathod/language/__init__.py b/pathod/language/__init__.py index 399baa3e..0841196e 100644 --- a/pathod/language/__init__.py +++ b/pathod/language/__init__.py @@ -3,6 +3,7 @@ from __future__ import absolute_import import itertools import time +from six.moves import range import pyparsing as pp from . import http, http2, websockets, writer, exceptions @@ -19,7 +20,7 @@ __all__ = [ def expand(msg): times = getattr(msg, "times", None) if times: - for j_ in xrange(int(times.value)): + for j_ in range(int(times.value)): yield msg.strike_token("times") else: yield msg diff --git a/pathod/language/base.py b/pathod/language/base.py index 97111ed6..1f4edb6f 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -3,6 +3,7 @@ import os import abc import pyparsing as pp +import six from six.moves import reduce from netlib.utils import escaped_str_to_bytes, bytes_to_escaped_str from netlib import human @@ -341,7 +342,7 @@ class OptionsOrValue(_Component): # it to be canonical. The user can specify a different case by using a # string value literal. self.option_used = False - if isinstance(value, basestring): + if isinstance(value, six.string_types): for i in self.options: # Find the exact option value in a case-insensitive way if i.lower() == value.lower(): |