Remove relative imports from all pkgs, fix astakos

astakos imports an anused (and soon deprecated) module

diff --git a/kamaki/cli/argument.py b/kamaki/cli/argument.py
index 6d8a643..fba139c 100644 (file)
--- a/kamaki/cli/argument.py
+++ b/kamaki/cli/argument.py
@@ -33,8 +33,8 @@
 
 from sys import exit
 
-from .config import Config
-from .errors import CLISyntaxError
+from kamaki.cli.config import Config
+from kamaki.cli.errors import CLISyntaxError
 
 class Argument(object):
     """An argument that can be parsed from command line or otherwise"""

diff --git a/kamaki/cli/command_shell.py b/kamaki/cli/command_shell.py
index 94c2c4c..4232ae6 100644 (file)
--- a/kamaki/cli/command_shell.py
+++ b/kamaki/cli/command_shell.py
@@ -35,7 +35,7 @@ from cmd import Cmd
 from new import instancemethod
 from os import popen
 from argparse import ArgumentParser
-from . import _update_parser, _exec_cmd
+from kamaki.cli import _update_parser, _exec_cmd
 from .errors import CLIError
 from .argument import _arguments
 from .utils import magenta, print_dict

diff --git a/kamaki/clients/__init__.py b/kamaki/clients/__init__.py
index 75ecf31..13f794a 100644 (file)
--- a/kamaki/clients/__init__.py
+++ b/kamaki/clients/__init__.py
@@ -33,9 +33,9 @@
 
 import json
 import logging
-from .connection import HTTPConnectionError
+from kamaki.clients.connection import HTTPConnectionError
 #from .connection.request import HTTPRequest
-from .connection.kamakicon import KamakiHTTPConnection
+from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
 
 sendlog = logging.getLogger('clients.send')
 recvlog = logging.getLogger('clients.recv')

diff --git a/kamaki/clients/astakos.py b/kamaki/clients/astakos.py
index 3aa5d84..0799d69 100644 (file)
--- a/kamaki/clients/astakos.py
+++ b/kamaki/clients/astakos.py
@@ -31,8 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from . import Client, ClientError
-from .connection.request import HTTPRequest
+from kamaki.clients import Client, ClientError
 
 class AstakosClient(Client):
     """GRNet Astakos API client"""

diff --git a/kamaki/clients/compute.py b/kamaki/clients/compute.py
index b7e18ba..000653e 100644 (file)
--- a/kamaki/clients/compute.py
+++ b/kamaki/clients/compute.py
@@ -31,9 +31,9 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from . import Client, ClientError
-from .connection.request import HTTPRequest
-from .utils import path4url
+from kamaki.clients import Client, ClientError
+from kamaki.clients.connection.request import HTTPRequest
+from kamaki.clients.utils import path4url
 import json
 
 

diff --git a/kamaki/clients/connection/kamakicon.py b/kamaki/clients/connection/kamakicon.py
index b7f663d..85e5c01 100644 (file)
--- a/kamaki/clients/connection/kamakicon.py
+++ b/kamaki/clients/connection/kamakicon.py
@@ -34,7 +34,7 @@
 from urlparse import urlparse
 #from .pool.http import get_http_connection
 from synnefo.lib.pool.http import get_http_connection
-from . import HTTPConnection, HTTPResponse, HTTPConnectionError
+from kamaki.clients.connection import HTTPConnection, HTTPResponse, HTTPConnectionError
 
 from json import loads
 

diff --git a/kamaki/clients/connection/request.py b/kamaki/clients/connection/request.py
index 01406be..a853795 100644 (file)
--- a/kamaki/clients/connection/request.py
+++ b/kamaki/clients/connection/request.py
@@ -32,7 +32,7 @@
 # or implied, of GRNET S.A.
 
 import requests
-from . import HTTPConnection, HTTPResponse, HTTPConnectionError
+from kamaki.clients.connection import HTTPConnection, HTTPResponse, HTTPConnectionError
 from kamaki.clients.connection.pool import ObjectPool
 from urlparse import urlparse
 

diff --git a/kamaki/clients/cyclades.py b/kamaki/clients/cyclades.py
index 8ff98a1..c633b6c 100644 (file)
--- a/kamaki/clients/cyclades.py
+++ b/kamaki/clients/cyclades.py
@@ -31,8 +31,8 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from .compute import ComputeClient, ClientError
-from .utils import path4url
+from kamaki.clients.compute import ComputeClient, ClientError
+from kamaki.clients.utils import path4url
 import json
 
 class CycladesClient(ComputeClient):

diff --git a/kamaki/clients/image.py b/kamaki/clients/image.py
index a759c6c..84b3cd1 100644 (file)
--- a/kamaki/clients/image.py
+++ b/kamaki/clients/image.py
@@ -30,8 +30,8 @@
 # documentation are those of the authors and should not be
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
-from . import Client, ClientError
-from .utils import path4url
+from kamaki.clients import Client, ClientError
+from kamaki.clients.utils import path4url
 
 class ImageClient(Client):
     """OpenStack Image Service API 1.0 and GRNET Plankton client"""

diff --git a/kamaki/clients/pithos.py b/kamaki/clients/pithos.py
index b05ef74..d34b4c2 100644 (file)
--- a/kamaki/clients/pithos.py
+++ b/kamaki/clients/pithos.py
@@ -45,9 +45,9 @@ import sys
 
 from binascii import hexlify
 
-from .pithos_rest_api import PithosRestAPI
-from .storage import ClientError
-from .utils import path4url, filter_in
+from kamaki.clients.pithos_rest_api import PithosRestAPI
+from kamaki.clients.storage import ClientError
+from kamaki.clients.utils import path4url, filter_in
 from StringIO import StringIO
 
 def pithos_hash(block, blockhash):

diff --git a/kamaki/clients/storage.py b/kamaki/clients/storage.py
index f30251f..4ccd154 100644 (file)
--- a/kamaki/clients/storage.py
+++ b/kamaki/clients/storage.py
@@ -31,8 +31,8 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from . import Client, ClientError
-from .utils import filter_in, filter_out, prefix_keys, path4url
+from kamaki.clients import Client, ClientError
+from kamaki.clients.utils import filter_in, filter_out, prefix_keys, path4url
 #from .connection.kamakicon import KamakiHTTPConnection
 
 class StorageClient(Client):