Skip to content

Commit e053bef

Browse files
committed
Switch to absolute imports
1 parent a3ced06 commit e053bef

File tree

11 files changed

+45
-24
lines changed

11 files changed

+45
-24
lines changed

dataverse/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
from __future__ import absolute_import
2+
13
from requests.packages import urllib3
24
urllib3.disable_warnings()
35

4-
from .connection import Connection
5-
from .dataverse import Dataverse
6-
from .dataset import Dataset
7-
from .file import DataverseFile
6+
from dataverse.connection import Connection
7+
from dataverse.dataverse import Dataverse
8+
from dataverse.dataset import Dataset
9+
from dataverse.file import DataverseFile

dataverse/connection.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
from __future__ import absolute_import
2+
13
from lxml import etree
24
import requests
35

4-
from .dataverse import Dataverse
5-
from . import exceptions
6-
from .utils import get_elements
6+
from dataverse.dataverse import Dataverse
7+
from dataverse import exceptions
8+
from dataverse.utils import get_elements
79

810

911
class Connection(object):

dataverse/dataset.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import absolute_import
2+
13
import os
24
import json
35

@@ -15,9 +17,9 @@
1517
NoContainerError, OperationFailedError, UnpublishedDataverseError,
1618
ConnectionError, MetadataNotFoundError, VersionJsonNotFoundError,
1719
)
18-
from .file import DataverseFile
19-
from .settings import SWORD_BOOTSTRAP
20-
from .utils import get_element, get_files_in_path, add_field
20+
from dataverse.file import DataverseFile
21+
from dataverse.settings import SWORD_BOOTSTRAP
22+
from dataverse.utils import get_element, get_files_in_path, add_field
2123

2224

2325
class Dataset(object):

dataverse/dataverse.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
from __future__ import absolute_import
2+
13
import requests
24

3-
from .dataset import Dataset
4-
from .exceptions import (
5+
from dataverse.dataset import Dataset
6+
from dataverse.exceptions import (
57
ConnectionError, MethodNotAllowedError, OperationFailedError,
68
)
7-
from .utils import get_element, get_elements, sanitize
9+
from dataverse.utils import get_element, get_elements, sanitize
810

911

1012
class Dataverse(object):

dataverse/exceptions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import absolute_import
2+
13
class DataverseError(Exception):
24
"""Base exception class for Dataverse-related error."""
35
pass

dataverse/file.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
from .utils import sanitize
1+
from __future__ import absolute_import
2+
3+
from dataverse.utils import sanitize
24

35

46
class DataverseFile(object):

dataverse/settings/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
from .defaults import *
1+
from __future__ import absolute_import
2+
3+
from dataverse.settings.defaults import *
24

35
try:
4-
from .local import *
6+
from dataverse.settings.local import *
57
except ImportError as error:
68
pass

dataverse/settings/defaults.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import absolute_import
2+
13
import os
24

35
TEST_HOST = 'apitest.dataverse.org'

dataverse/test/config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
from __future__ import absolute_import
2+
13
import os
4+
25
from dataverse.settings import BASE_PATH
36

47
PICS_OF_CATS_DATASET = {

dataverse/test/test_dataverse.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
from __future__ import print_function
1+
from __future__ import print_function, absolute_import
22

33
import pytest
44

55
import uuid
66
import httpretty
77

8-
from ..connection import Connection
9-
from ..dataset import Dataset
10-
from ..settings import TEST_HOST, TEST_TOKEN
11-
from ..test.config import PICS_OF_CATS_DATASET, ATOM_DATASET, EXAMPLE_FILES
12-
from .. import exceptions
13-
from .. import utils
8+
from dataverse.connection import Connection
9+
from dataverse.dataset import Dataset
10+
from dataverse.settings import TEST_HOST, TEST_TOKEN
11+
from dataverse.test.config import PICS_OF_CATS_DATASET, ATOM_DATASET, EXAMPLE_FILES
12+
from dataverse import exceptions
13+
from dataverse import utils
1414

1515
import logging
1616
logging.basicConfig(level=logging.ERROR)

0 commit comments

Comments
 (0)