diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-23 17:41:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-23 17:41:16 +0000 |
| commit | 43a838eabfd7ace47f9052a090c65aa1f6fb786e (patch) | |
| tree | a4d00ceba410fb7313373d34e66c98bbe529e9f9 | |
| parent | 8ffaa0a4ce5676a90980ab879661659767f24d8e (diff) | |
| parent | 69281a580f360a6d8c6a9631a55155e47cde2e40 (diff) | |
| download | python-swiftclient-43a838eabfd7ace47f9052a090c65aa1f6fb786e.tar.gz | |
Merge "python3: Start of adding basic python3 support."
| -rw-r--r-- | swiftclient/__init__.py | 2 | ||||
| -rw-r--r-- | tests/test_swiftclient.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/swiftclient/__init__.py b/swiftclient/__init__.py index f0fbf7f..1d74249 100644 --- a/swiftclient/__init__.py +++ b/swiftclient/__init__.py @@ -17,7 +17,7 @@ """" OpenStack Swift Python client binding. """ -from client import * +from .client import * # At setup.py time, we haven't installed anything yet, so there # is nothing that is able to set this version property. Squelching diff --git a/tests/test_swiftclient.py b/tests/test_swiftclient.py index 2b4782a..a072878 100644 --- a/tests/test_swiftclient.py +++ b/tests/test_swiftclient.py @@ -23,7 +23,7 @@ import warnings from urlparse import urlparse # TODO: mock http connection class with more control over headers -from utils import fake_http_connect, fake_get_keystoneclient_2_0 +from .utils import fake_http_connect, fake_get_keystoneclient_2_0 from swiftclient import client as c from swiftclient import utils as u |