Initial python3 changes

Mostly just updating libraries, removing string encoding/decoding,
fixing some edge cases. No new functionality was added in this
commit.

lib/concurrent/futures/_base.py

@@ -1,7 +1,7 @@
 # Copyright 2009 Brian Quinlan. All Rights Reserved.
 # Licensed to PSF under a Contributor Agreement.
 
-from __future__ import with_statement
+
 import logging
 import threading
 import time

lib/concurrent/futures/_compat.py

@@ -29,7 +29,7 @@ def namedtuple(typename, field_names):
 
     # Parse and validate the field names.  Validation serves two purposes,
     # generating informative error messages and preventing template injection attacks.
-    if isinstance(field_names, basestring):
+    if isinstance(field_names, str):
         field_names = field_names.replace(',', ' ').split() # names separated by whitespace and/or commas
     field_names = tuple(map(str, field_names))
     for name in (typename,) + field_names:

lib/concurrent/futures/process.py

@@ -43,7 +43,7 @@ Process #1..n:
   _ResultItems in "Request Q"
 """
 
-from __future__ import with_statement
+
 import atexit
 import multiprocessing
 import threading
@@ -55,7 +55,7 @@ from concurrent.futures import _base
 try:
     import queue
 except ImportError:
-    import Queue as queue
+    import queue as queue
 
 __author__ = 'Brian Quinlan (brian@sweetapp.com)'
 

lib/concurrent/futures/thread.py

@@ -3,7 +3,7 @@
 
 """Implements ThreadPoolExecutor."""
 
-from __future__ import with_statement
+
 import atexit
 import threading
 import weakref
@@ -14,7 +14,7 @@ from concurrent.futures import _base
 try:
     import queue
 except ImportError:
-    import Queue as queue
+    import queue as queue
 
 __author__ = 'Brian Quinlan (brian@sweetapp.com)'