Revision c270fe96

b/kamaki/cli/argument.py
33 33

  
34 34
from sys import exit
35 35

  
36
from .config import Config
37
from .errors import CLISyntaxError
36
from kamaki.cli.config import Config
37
from kamaki.cli.errors import CLISyntaxError
38 38

  
39 39
class Argument(object):
40 40
    """An argument that can be parsed from command line or otherwise"""
b/kamaki/cli/command_shell.py
35 35
from new import instancemethod
36 36
from os import popen
37 37
from argparse import ArgumentParser
38
from . import _update_parser, _exec_cmd
38
from kamaki.cli import _update_parser, _exec_cmd
39 39
from .errors import CLIError
40 40
from .argument import _arguments
41 41
from .utils import magenta, print_dict
b/kamaki/clients/__init__.py
33 33

  
34 34
import json
35 35
import logging
36
from .connection import HTTPConnectionError
36
from kamaki.clients.connection import HTTPConnectionError
37 37
#from .connection.request import HTTPRequest
38
from .connection.kamakicon import KamakiHTTPConnection
38
from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
39 39

  
40 40
sendlog = logging.getLogger('clients.send')
41 41
recvlog = logging.getLogger('clients.recv')
b/kamaki/clients/astakos.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from . import Client, ClientError
35
from .connection.request import HTTPRequest
34
from kamaki.clients import Client, ClientError
36 35

  
37 36
class AstakosClient(Client):
38 37
    """GRNet Astakos API client"""
b/kamaki/clients/compute.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from . import Client, ClientError
35
from .connection.request import HTTPRequest
36
from .utils import path4url
34
from kamaki.clients import Client, ClientError
35
from kamaki.clients.connection.request import HTTPRequest
36
from kamaki.clients.utils import path4url
37 37
import json
38 38

  
39 39

  
b/kamaki/clients/connection/kamakicon.py
34 34
from urlparse import urlparse
35 35
#from .pool.http import get_http_connection
36 36
from synnefo.lib.pool.http import get_http_connection
37
from . import HTTPConnection, HTTPResponse, HTTPConnectionError
37
from kamaki.clients.connection import HTTPConnection, HTTPResponse, HTTPConnectionError
38 38

  
39 39
from json import loads
40 40

  
b/kamaki/clients/connection/request.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
import requests
35
from . import HTTPConnection, HTTPResponse, HTTPConnectionError
35
from kamaki.clients.connection import HTTPConnection, HTTPResponse, HTTPConnectionError
36 36
from kamaki.clients.connection.pool import ObjectPool
37 37
from urlparse import urlparse
38 38

  
b/kamaki/clients/cyclades.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from .compute import ComputeClient, ClientError
35
from .utils import path4url
34
from kamaki.clients.compute import ComputeClient, ClientError
35
from kamaki.clients.utils import path4url
36 36
import json
37 37

  
38 38
class CycladesClient(ComputeClient):
b/kamaki/clients/image.py
30 30
# documentation are those of the authors and should not be
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33
from . import Client, ClientError
34
from .utils import path4url
33
from kamaki.clients import Client, ClientError
34
from kamaki.clients.utils import path4url
35 35

  
36 36
class ImageClient(Client):
37 37
    """OpenStack Image Service API 1.0 and GRNET Plankton client"""
b/kamaki/clients/pithos.py
45 45

  
46 46
from binascii import hexlify
47 47

  
48
from .pithos_rest_api import PithosRestAPI
49
from .storage import ClientError
50
from .utils import path4url, filter_in
48
from kamaki.clients.pithos_rest_api import PithosRestAPI
49
from kamaki.clients.storage import ClientError
50
from kamaki.clients.utils import path4url, filter_in
51 51
from StringIO import StringIO
52 52

  
53 53
def pithos_hash(block, blockhash):
b/kamaki/clients/storage.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from . import Client, ClientError
35
from .utils import filter_in, filter_out, prefix_keys, path4url
34
from kamaki.clients import Client, ClientError
35
from kamaki.clients.utils import filter_in, filter_out, prefix_keys, path4url
36 36
#from .connection.kamakicon import KamakiHTTPConnection
37 37

  
38 38
class StorageClient(Client):

Also available in: Unified diff