Move OrderedDict import where it is actually used

diff --git a/kamaki/cli.py b/kamaki/cli.py
index 9d6b6d6..a4be116 100755 (executable)
--- a/kamaki/cli.py
+++ b/kamaki/cli.py
@@ -77,13 +77,18 @@ from base64 import b64encode
 from os.path import abspath, basename, exists
 from sys import exit, stdout, stderr
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
+
 from colors import magenta, red, yellow
 from progress.bar import IncrementalBar
 from requests.exceptions import ConnectionError
 
-from kamaki import clients
-from kamaki.config import Config
-from kamaki.utils import OrderedDict, print_addresses, print_dict, print_items
+from . import clients
+from .config import Config
+from .utils import print_addresses, print_dict, print_items
 
 
 _commands = OrderedDict()

diff --git a/kamaki/config.py b/kamaki/config.py
index 620e51a..f4733ac 100644 (file)
--- a/kamaki/config.py
+++ b/kamaki/config.py
@@ -36,7 +36,10 @@ import os
 from collections import defaultdict
 from ConfigParser import RawConfigParser, NoOptionError, NoSectionError
 
-from .utils import OrderedDict
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 
 # Path to the file that stores the configuration

diff --git a/kamaki/utils.py b/kamaki/utils.py
index 00c42a5..a4ac780 100644 (file)
--- a/kamaki/utils.py
+++ b/kamaki/utils.py
@@ -31,12 +31,6 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
-
-
 def print_addresses(addresses, margin):
     for address in addresses:
         if address['id'] == 'public':