Fixes for the StringIO import make it 2to3 friendly.

Author: palewire

documentcloud/MultipartPostHandler.py

@@ -48,9 +48,9 @@
 from os import SEEK_END
 from six.moves import urllib
 try:
-    import io
-except ImportError:
     import cStringIO as io
+except ImportError:
+    import io
 
 
 class Callable:

documentcloud/__init__.py

@@ -13,6 +13,7 @@
 """
 from __future__ import absolute_import
 import os
+import sys
 import six
 import copy
 import base64
@@ -70,11 +71,12 @@ def _make_request(self, url, params=None, opener=None):
         # Make the request
         try:
             response = request_method(request)
-        except urllib.error.HTTPError, e:
-            if e.code == 404:
+        except:
+            e = sys.exc_info()[1]
+            if getattr(e, 'code', None) == 404:
                 raise DoesNotExistError("The resource you've requested does \
 not exist or is unavailable without the proper credentials.")
-            elif e.code == 401:
+            elif getattr(e, 'code', None) == 401:
                 raise CredentialsFailedError("The resource you've requested \
 requires proper credentials.")
             else:

test.py

@@ -13,9 +13,9 @@
 import textwrap
 import unittest
 try:
-    import io
-except ImportError:
     import cStringIO as io
+except ImportError:
+    import io
 from copy import copy
 from documentcloud import DocumentCloud
 from documentcloud.toolbox import DoesNotExistError