From 769e20f2a9749db802b544531a4ce71575d3a90a Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Tue, 31 May 2016 00:41:44 +0530 Subject: Py3: Use range from six.moves --- pathod/language/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pathod') 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 -- cgit v1.2.3 From 42f16d5d403667609416427d823e6793a5cc1640 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Tue, 31 May 2016 00:49:44 +0530 Subject: Py3: Use six.string_types instead of basestring --- pathod/language/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pathod') 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(): -- cgit v1.2.3