From 71f02acf8bbb064038cbf79f36e56cabd7bdd315 Mon Sep 17 00:00:00 2001 From: Brent Pedersen Date: Wed, 3 Dec 2014 16:44:39 -0700 Subject: [PATCH] cleanup --- toolshed/__init__.py | 6 ++++-- toolshed/files.py | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/toolshed/__init__.py b/toolshed/__init__.py index 1d6138c..17f6422 100644 --- a/toolshed/__init__.py +++ b/toolshed/__init__.py @@ -1,9 +1,11 @@ -from .files import (reader, tokens, nopen, header, is_newer_b, - basestring, int_types) +from .files import (reader, tokens, nopen, header, is_newer_b, int_types) import sys from .pool import pool, pmap from .fmt import fmt2header +if sys.version_info[0] == 3: + basestring = str + from itertools import groupby as igroupby from operator import itemgetter diff --git a/toolshed/files.py b/toolshed/files.py index bca1b83..b8f4bc1 100644 --- a/toolshed/files.py +++ b/toolshed/files.py @@ -25,7 +25,6 @@ if sys.version_info[0] < 3: int_types = (int, long) urlopen = urllib.urlopen - basestring = basestring else: int_types = (int,) basestring = str @@ -260,7 +259,7 @@ def _re_line_gen(f, sep): from ordereddict import OrderedDict as a_dict header = True - if header == True: + if header is True: header = next(line_gen) header[0] = header[0].lstrip("#")