Merge pull request #20 from astrofrog/python3

Get tests to pass in Python 3

Author: rliebz

dataverse/__init__.py

@@ -1,7 +1,9 @@
+from __future__ import absolute_import
+
 from requests.packages import urllib3
 urllib3.disable_warnings()
 
-from .connection import Connection
-from .dataverse import Dataverse
-from .dataset import Dataset
-from .file import DataverseFile
+from dataverse.connection import Connection
+from dataverse.dataverse import Dataverse
+from dataverse.dataset import Dataset
+from dataverse.file import DataverseFile

dataverse/connection.py

@@ -1,9 +1,11 @@
+from __future__ import absolute_import
+
 from lxml import etree
 import requests
 
-from dataverse import Dataverse
-import exceptions
-from utils import get_elements
+from dataverse.dataverse import Dataverse
+from dataverse import exceptions
+from dataverse.utils import get_elements
 
 
 class Connection(object):

dataverse/dataset.py

@@ -1,18 +1,25 @@
+from __future__ import absolute_import
+
 import os
 import json
-import StringIO
+
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import BytesIO as StringIO
+
 from zipfile import ZipFile
 
 from lxml import etree
 import requests
 
-from exceptions import (
+from .exceptions import (
     NoContainerError, OperationFailedError, UnpublishedDataverseError,
     ConnectionError, MetadataNotFoundError, VersionJsonNotFoundError,
 )
-from file import DataverseFile
-from settings import SWORD_BOOTSTRAP
-from utils import get_element, get_files_in_path, add_field
+from dataverse.file import DataverseFile
+from dataverse.settings import SWORD_BOOTSTRAP
+from dataverse.utils import get_element, get_files_in_path, add_field
 
 
 class Dataset(object):
@@ -35,7 +42,8 @@ def __init__(self, entry=SWORD_BOOTSTRAP, dataverse=None, edit_uri=None,
         self._id = None
 
         # Updates sword entry from keyword arguments
-        for key, value in kwargs.iteritems():
+        for key in kwargs:
+            value = kwargs[key]
             if isinstance(value, list):
                 for item in value:
                     add_field(self._entry, key, item, 'dcterms')
@@ -271,7 +279,7 @@ def upload_filepaths(self, filepaths):
             filepaths = get_files_in_path(filepaths[0])
 
         # Zip up files
-        s = StringIO.StringIO()
+        s = StringIO()
         zip_file = ZipFile(s, 'w')
         for filepath in filepaths:
             zip_file.write(filepath)
@@ -282,7 +290,7 @@ def upload_filepaths(self, filepaths):
 
     def upload_file(self, filename, content, zip_files=True):
         if zip_files:
-            s = StringIO.StringIO()
+            s = StringIO()
             zip_file = ZipFile(s, 'w')
             zip_file.writestr(filename, content)
             zip_file.close()

dataverse/dataverse.py

@@ -1,10 +1,12 @@
+from __future__ import absolute_import
+
 import requests
 
-from dataset import Dataset
-from exceptions import (
+from dataverse.dataset import Dataset
+from dataverse.exceptions import (
     ConnectionError, MethodNotAllowedError, OperationFailedError,
 )
-from utils import get_element, get_elements, sanitize
+from dataverse.utils import get_element, get_elements, sanitize
 
 
 class Dataverse(object):

dataverse/exceptions.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 class DataverseError(Exception):
     """Base exception class for Dataverse-related error."""
     pass

dataverse/file.py

@@ -1,4 +1,6 @@
-from utils import sanitize
+from __future__ import absolute_import
+
+from dataverse.utils import sanitize
 
 
 class DataverseFile(object):

dataverse/settings/__init__.py

@@ -1,6 +1,8 @@
-from .defaults import *
+from __future__ import absolute_import
+
+from dataverse.settings.defaults import *
 
 try:
-    from .local import *
+    from dataverse.settings.local import *
 except ImportError as error:
     pass

dataverse/settings/defaults.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 
 TEST_HOST = 'apitest.dataverse.org'

dataverse/test/config.py

@@ -1,4 +1,7 @@
+from __future__ import absolute_import
+
 import os
+
 from dataverse.settings import BASE_PATH
 
 PICS_OF_CATS_DATASET = {

dataverse/test/test_dataverse.py

@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import
+
 import pytest
 
 import uuid
@@ -195,10 +197,10 @@ class TestDatasetOperations(object):
 
     @classmethod
     def setup_class(cls):
-        print 'Connecting to Dataverse host at {0}'.format(TEST_HOST)
+        print('Connecting to Dataverse host at {0}'.format(TEST_HOST))
         cls.connection = Connection(TEST_HOST, TEST_TOKEN)
 
-        print 'Creating test Dataverse'
+        print('Creating test Dataverse')
         cls.alias = str(uuid.uuid1())
         cls.connection.create_dataverse(
             cls.alias,
@@ -211,7 +213,7 @@ def setup_class(cls):
     @classmethod
     def teardown_class(cls):
 
-        print 'Removing test Dataverse'
+        print('Removing test Dataverse')
         cls.connection.delete_dataverse(cls.dataverse)
         dataverse = cls.connection.get_dataverse(cls.alias, True)
         assert dataverse is None