From 8360f70024330eeeb5c53d29e4a05194f872b511 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 15:15:22 +1300 Subject: First-order conversion to Python3-only - Zap various occurrences of Python2 in docs and scripts - Remove six from netlib, and some other places where obvious project-wide search and replace works. --- pathod/language/base.py | 3 +-- pathod/pathoc.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'pathod') diff --git a/pathod/language/base.py b/pathod/language/base.py index 39155858..3446f74c 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -3,7 +3,6 @@ import os import abc import pyparsing as pp -import six from six.moves import reduce from netlib import strutils from netlib import human @@ -342,7 +341,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, six.string_types): + if isinstance(value, str): for i in self.options: # Find the exact option value in a case-insensitive way if i.lower() == value.lower(): diff --git a/pathod/pathoc.py b/pathod/pathoc.py index e2627a61..59ae5fba 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -461,7 +461,7 @@ class Pathoc(tcp.TCPClient): May raise a exceptions.NetlibException """ - if isinstance(r, six.string_types): + if isinstance(r, str): r = next(language.parse_pathoc(r, self.use_http2)) if isinstance(r, language.http.Request): -- cgit v1.2.3