More Python3 and pyflakes fixes

Author: palewire

documentcloud/MultipartPostHandler.py

@@ -62,9 +62,9 @@ def __init__(self, anycallable):
 doseq = 1
 
 
-class MultipartPostHandler(urllib2.request.BaseHandler):
+class MultipartPostHandler(urllib.request.BaseHandler):
     # needs to run first
-    handler_order = urllib2.request.HTTPHandler.handler_order - 10
+    handler_order = urllib.request.HTTPHandler.handler_order - 10
 
     def http_request(self, request):
         data = request.get_data()
@@ -90,7 +90,7 @@ def http_request(self, request):
                         'multipart/form-data') != 0
                 ):
                     six.print_(
-                            "Replacing %s with %s" % (
+                        "Replacing %s with %s" % (
                             request.get_header('content-type'),
                             'multipart/form-data'
                         )
@@ -146,7 +146,7 @@ def getsize(o_file):
 
 
 def main():
-    opener = urllib2.request.build_opener(MultipartPostHandler)
+    opener = urllib.request.build_opener(MultipartPostHandler)
 
     def validateFile(url):
         temp = tempfile.mkstemp(suffix=".html")

documentcloud/__init__.py

@@ -51,7 +51,7 @@ def _make_request(self, url, params=None, opener=None):
         """
         # Create the request object
         args = [i for i in [url, params] if i]
-        request = urllib2.request.Request(*args)
+        request = urllib.request.Request(*args)
         # If the client has credentials, include them as a header
         if self.username and self.password:
             credentials = '%s:%s' % (self.username, self.password)
@@ -63,14 +63,14 @@ def _make_request(self, url, params=None, opener=None):
         # If the request provides a custom opener, like the upload request,
         # which relies on a multipart request, it is applied here.
         if opener:
-            opener = urllib2.request.build_opener(opener)
+            opener = urllib.request.build_opener(opener)
             request_method = opener.open
         else:
-            request_method = urllib2.request.urlopen
+            request_method = urllib.request.urlopen
         # Make the request
         try:
             response = request_method(request)
-        except urllib2.error.HTTPError as e:
+        except urllib.error.HTTPError as e:
             if e.code == 404:
                 raise DoesNotExistError("The resource you've requested does \
 not exist or is unavailable without the proper credentials.")
@@ -693,10 +693,10 @@ def get_entities(self):
 
     def _get_url(self, url):
         if self.access == 'public':
-            req = urllib2.request.Request(url)
+            req = urllib.request.Request(url)
             try:
-                return urllib2.request.urlopen(req).read()
-            except urllib2.error.HTTPError:
+                return urllib.request.urlopen(req).read()
+            except urllib.error.HTTPError:
                 raise NotImplementedError(
                     "Currently, DocumentCloud only allows you to access this \
 resource on public documents."

tox.ini

@@ -0,0 +1,9 @@
+[tox]
+envlist=py25,py26,py27,py32,py33
+
+[testenv]
+deps=
+    python-dateutil
+    simplejson
+    six
+commands=python quicktest.py documentcloud