More Python3 changes

Author: palewire

.travis.yml

@@ -1,8 +1,5 @@
 language: python
 python:
-- '2.5'
-- '2.6'
-- '2.7'
 - '3.3'
 install:
 - pip install -r requirements.txt --use-mirrors

documentcloud/MultipartPostHandler.py

@@ -43,15 +43,16 @@
 import sys
 import six
 import tempfile
-import mimetools
 import mimetypes
 from os import SEEK_END
-from six.moves import urllib
-try:
-    import cStringIO as io
-except ImportError:
+if six.PY3:
     import io
-
+    import urllib
+    from email.generator import _make_boundary as choose_boundary
+else:
+    import cStringIO as io
+    from six.moves import urllib
+    from mimetools import choose_boundary
 
 class Callable:
     def __init__(self, anycallable):
@@ -102,7 +103,7 @@ def http_request(self, request):
 
     def multipart_encode(vars, files, boundary=None, buf=None):
         if boundary is None:
-            boundary = mimetools.choose_boundary()
+            boundary = choose_boundary()
         if buf is None:
             buf = io.StringIO()
         for(key, value) in vars:

documentcloud/__init__.py

@@ -18,13 +18,16 @@
 import copy
 import base64
 from .toolbox import retry
-from six.moves import urllib
 from .toolbox import DoesNotExistError
 from .toolbox import DuplicateObjectError
 from .toolbox import credentials_required
 from .toolbox import CredentialsFailedError
 from dateutil.parser import parse as dateparser
 from .MultipartPostHandler import MultipartPostHandler
+if six.PY3:
+    import urllib
+else:
+    from six.moves import urllib
 try:
     import json
 except ImportError: