cleanup

brentp · Dec 3, 2014 · 71f02ac · 71f02ac
1 parent 8eeaa50
commit 71f02ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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("#")