gkeys: Use snakeoil's demandload where appropriate

4 files changed, 31 insertions, 13 deletions

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 7b834a4..80c3c72 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -24,13 +24,17 @@ else:
 
 
 from collections import defaultdict
-from json import load
 
-from gkeys.lib import GkeysGPG
-from gkeys.seedhandler import SeedHandler
+from snakeoil.demandload import demandload
+
 from gkeys.gkey import GKEY
 from gkeys.checks import SPECCHECK_SUMMARY, convert_pf, convert_yn
 
+demandload(
+    "json:load",
+    "gkeys.lib:GkeysGPG",
+    "gkeys.seedhandler:SeedHandler",
+)
 
 class Actions(object):
     '''Primary API actions'''
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py
index ca5e2d2..985f6a1 100644
--- a/gkeys/gkeys/seed.py
+++ b/gkeys/gkeys/seed.py
@@ -21,11 +21,15 @@ import json
 import os
 import sys
 
-from gkeys.exception import UpdateDbError
-from gkeys.log import logger
+from snakeoil.demandload import demandload
+
 from gkeys.gkey import GKEY
-from gkeys.fileops import ensure_dirs
 
+demandload(
+    "gkeys.log:logger",
+    "gkeys.exception:UpdateDbError",
+    "gkeys.fileops:ensure_dirs",
+)
 
 if sys.version_info[0] >= 3:
     def decoder(text, enc='utf_8'):
diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py
index 8b787d1..86cab25 100644
--- a/gkeys/gkeys/seedhandler.py
+++ b/gkeys/gkeys/seedhandler.py
@@ -12,12 +12,17 @@
 
 import os
 import re
-from json import load
 
-from gkeys.exception import UpdateDbError
+from snakeoil.demandload import demandload
+
 from gkeys.gkey import GKEY
 from gkeys.seed import Seeds, decoder
-from gkeys.fileops import ensure_dirs
+
+demandload(
+    "json:load",
+    "gkeys.exception:UpdateDbError",
+    "gkeys.fileops:ensure_dirs",
+)
 
 
 class SeedHandler(object):
diff --git a/gkeys/gkeys/utils.py b/gkeys/gkeys/utils.py
index 92abc50..64f11aa 100644
--- a/gkeys/gkeys/utils.py
+++ b/gkeys/gkeys/utils.py
@@ -24,10 +24,15 @@ Utility functions'''
 
 import types
 import re
-import os
-import sys
-import locale
-import codecs
+
+from snakeoil.demandload import demandload
+
+demandload(
+    "os",
+    "sys",
+    "locale",
+    "codecs",
+)
 
 try:
     StringTypes = types.StringTypes