From e6180a5a81b15459fda5aca32aabf214f7b4a7b0 Mon Sep 17 00:00:00 2001
From: Jim Paris <jim@jtan.com>
Date: Fri, 1 Feb 2013 16:02:01 -0500
Subject: [PATCH] Remove all relative imports

---
 nilmdb/client/__init__.py  |  4 ++--
 nilmdb/cmdline/__init__.py |  2 +-
 nilmdb/cmdline/cmdline.py  |  3 +--
 nilmdb/utils/__init__.py   | 18 +++++++++---------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/nilmdb/client/__init__.py b/nilmdb/client/__init__.py
index c1b53b4..f1b0734 100644
--- a/nilmdb/client/__init__.py
+++ b/nilmdb/client/__init__.py
@@ -1,4 +1,4 @@
 """nilmdb.client"""
 
-from .client import Client
-from .errors import ClientError, ServerError, Error
+from nilmdb.client.client import Client
+from nilmdb.client.errors import ClientError, ServerError, Error
diff --git a/nilmdb/cmdline/__init__.py b/nilmdb/cmdline/__init__.py
index c86f644..24b4acc 100644
--- a/nilmdb/cmdline/__init__.py
+++ b/nilmdb/cmdline/__init__.py
@@ -1,3 +1,3 @@
 """nilmdb.cmdline"""
 
-from .cmdline import Cmdline
+from nilmdb.cmdline.cmdline import Cmdline
diff --git a/nilmdb/cmdline/cmdline.py b/nilmdb/cmdline/cmdline.py
index f5ea549..8061b16 100644
--- a/nilmdb/cmdline/cmdline.py
+++ b/nilmdb/cmdline/cmdline.py
@@ -16,8 +16,7 @@ version = "1.0"
 subcommands = [ "info", "create", "list", "metadata", "insert", "extract",
                 "remove", "destroy" ]
 
-# Import the subcommand modules.  Equivalent way of doing this would be
-# from . import info as cmd_info
+# Import the subcommand modules
 subcmd_mods = {}
 for cmd in subcommands:
     subcmd_mods[cmd] = __import__("nilmdb.cmdline." + cmd, fromlist = [ cmd ])
diff --git a/nilmdb/utils/__init__.py b/nilmdb/utils/__init__.py
index 0e16f5b..2eee575 100644
--- a/nilmdb/utils/__init__.py
+++ b/nilmdb/utils/__init__.py
@@ -1,11 +1,11 @@
 """NilmDB utilities"""
 
-from .timer import Timer
-from .iteratorizer import Iteratorizer
-from .serializer import Serializer
-from .lrucache import lru_cache
-from .diskusage import du
-from .mustclose import must_close
-from .urllib import urlencode
-from . import misc
-from . import atomic
+from nilmdb.utils.timer import Timer
+from nilmdb.utils.iteratorizer import Iteratorizer
+from nilmdb.utils.serializer import Serializer
+from nilmdb.utils.lrucache import lru_cache
+from nilmdb.utils.diskusage import du
+from nilmdb.utils.mustclose import must_close
+from nilmdb.utils.urllib import urlencode
+from nilmdb.utils import misc
+from nilmdb.utils import atomic