From d60ef617e33211cee3808c8b145d576f34ff437a Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 15:43:38 +1300 Subject: pathod: remove six --- pathod/language/__init__.py | 1 - pathod/language/base.py | 6 +++--- pathod/language/generators.py | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'pathod/language') diff --git a/pathod/language/__init__.py b/pathod/language/__init__.py index a43424ea..15c2895b 100644 --- a/pathod/language/__init__.py +++ b/pathod/language/__init__.py @@ -3,7 +3,6 @@ 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 diff --git a/pathod/language/base.py b/pathod/language/base.py index 3446f74c..bdcc6d2f 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -1,9 +1,9 @@ import operator import os import abc +import functools import pyparsing as pp -from six.moves import reduce from netlib import strutils from netlib import human @@ -171,14 +171,14 @@ class TokValueGenerate(Token): def expr(cls): e = pp.Literal("@").suppress() + v_integer - u = reduce( + u = functools.reduce( operator.or_, [pp.Literal(i) for i in human.SIZE_UNITS.keys()] ).leaveWhitespace() e = e + pp.Optional(u, default=None) s = pp.Literal(",").suppress() - s += reduce( + s += functools.reduce( operator.or_, [pp.Literal(i) for i in generators.DATATYPES.keys()] ) diff --git a/pathod/language/generators.py b/pathod/language/generators.py index 68705941..4040e099 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -2,7 +2,6 @@ import string import random import mmap -import six import sys DATATYPES = dict( @@ -52,8 +51,6 @@ def rand_byte(chars): """ # bytearray has consistent behaviour on both Python 2 and 3 # while bytes does not - if six.PY2: - return random.choice(chars) return bytes([random.choice(chars)]) -- cgit v1.2.3