Get tests to pass in Python 3

Author: astrofrog

dataverse/connection.py

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

dataverse/dataset.py

@@ -1,18 +1,23 @@
 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 .file import DataverseFile
+from .settings import SWORD_BOOTSTRAP
+from .utils import get_element, get_files_in_path, add_field
 
 
 class Dataset(object):
@@ -35,7 +40,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 +277,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 +288,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,10 @@
 import requests
 
-from dataset import Dataset
-from exceptions import (
+from .dataset import Dataset
+from .exceptions import (
     ConnectionError, MethodNotAllowedError, OperationFailedError,
 )
-from utils import get_element, get_elements, sanitize
+from .utils import get_element, get_elements, sanitize
 
 
 class Dataverse(object):

dataverse/file.py

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

dataverse/test/test_dataverse.py

@@ -1,14 +1,16 @@
+from __future__ import print_function
+
 import pytest
 
 import uuid
 import httpretty
 
-from dataverse.connection import Connection
-from dataverse.dataset import Dataset
-from dataverse.settings import TEST_HOST, TEST_TOKEN
-from dataverse.test.config import PICS_OF_CATS_DATASET, ATOM_DATASET, EXAMPLE_FILES
-from dataverse import exceptions
-from dataverse import utils
+from ..connection import Connection
+from ..dataset import Dataset
+from ..settings import TEST_HOST, TEST_TOKEN
+from ..test.config import PICS_OF_CATS_DATASET, ATOM_DATASET, EXAMPLE_FILES
+from .. import exceptions
+from .. import utils
 
 import logging
 logging.basicConfig(level=logging.ERROR)
@@ -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

dataverse/utils.py

@@ -3,7 +3,7 @@
 from lxml import etree
 import bleach
 
-from settings import SWORD_NAMESPACE, REPLACEMENT_DICT, UNIQUE_FIELDS
+from .settings import SWORD_NAMESPACE, REPLACEMENT_DICT, UNIQUE_FIELDS
 
 
 # factor out xpath operations so we don't have to look at its ugliness
@@ -15,7 +15,7 @@ def get_element(root, tag='*', namespace=None, attribute=None, attribute_value=N
 def get_elements(root, tag='*', namespace=None, attribute=None, attribute_value=None):
 
     # If string, convert to etree element
-    if isinstance(root, str):
+    if isinstance(root, (str, bytes)):
         root = etree.XML(root)
 
     namespace = root.nsmap.get(namespace, namespace)