| 1 |
commit: 75cd2f50c181c78863e71ebbef17c70da90bfe6c |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 23 15:37:24 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 30 23:18:51 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=75cd2f50 |
| 7 |
|
| 8 |
gkeys: Use snakeoil's demandload where appropriate |
| 9 |
|
| 10 |
gkeys/gkeys/actions.py | 10 +++++++--- |
| 11 |
gkeys/gkeys/seed.py | 10 +++++++--- |
| 12 |
gkeys/gkeys/seedhandler.py | 11 ++++++++--- |
| 13 |
gkeys/gkeys/utils.py | 13 +++++++++---- |
| 14 |
4 files changed, 31 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
| 17 |
index 7b834a4..80c3c72 100644 |
| 18 |
--- a/gkeys/gkeys/actions.py |
| 19 |
+++ b/gkeys/gkeys/actions.py |
| 20 |
@@ -24,13 +24,17 @@ else: |
| 21 |
|
| 22 |
|
| 23 |
from collections import defaultdict |
| 24 |
-from json import load |
| 25 |
|
| 26 |
-from gkeys.lib import GkeysGPG |
| 27 |
-from gkeys.seedhandler import SeedHandler |
| 28 |
+from snakeoil.demandload import demandload |
| 29 |
+ |
| 30 |
from gkeys.gkey import GKEY |
| 31 |
from gkeys.checks import SPECCHECK_SUMMARY, convert_pf, convert_yn |
| 32 |
|
| 33 |
+demandload( |
| 34 |
+ "json:load", |
| 35 |
+ "gkeys.lib:GkeysGPG", |
| 36 |
+ "gkeys.seedhandler:SeedHandler", |
| 37 |
+) |
| 38 |
|
| 39 |
class Actions(object): |
| 40 |
'''Primary API actions''' |
| 41 |
|
| 42 |
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py |
| 43 |
index ca5e2d2..985f6a1 100644 |
| 44 |
--- a/gkeys/gkeys/seed.py |
| 45 |
+++ b/gkeys/gkeys/seed.py |
| 46 |
@@ -21,11 +21,15 @@ import json |
| 47 |
import os |
| 48 |
import sys |
| 49 |
|
| 50 |
-from gkeys.exception import UpdateDbError |
| 51 |
-from gkeys.log import logger |
| 52 |
+from snakeoil.demandload import demandload |
| 53 |
+ |
| 54 |
from gkeys.gkey import GKEY |
| 55 |
-from gkeys.fileops import ensure_dirs |
| 56 |
|
| 57 |
+demandload( |
| 58 |
+ "gkeys.log:logger", |
| 59 |
+ "gkeys.exception:UpdateDbError", |
| 60 |
+ "gkeys.fileops:ensure_dirs", |
| 61 |
+) |
| 62 |
|
| 63 |
if sys.version_info[0] >= 3: |
| 64 |
def decoder(text, enc='utf_8'): |
| 65 |
|
| 66 |
diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py |
| 67 |
index 8b787d1..86cab25 100644 |
| 68 |
--- a/gkeys/gkeys/seedhandler.py |
| 69 |
+++ b/gkeys/gkeys/seedhandler.py |
| 70 |
@@ -12,12 +12,17 @@ |
| 71 |
|
| 72 |
import os |
| 73 |
import re |
| 74 |
-from json import load |
| 75 |
|
| 76 |
-from gkeys.exception import UpdateDbError |
| 77 |
+from snakeoil.demandload import demandload |
| 78 |
+ |
| 79 |
from gkeys.gkey import GKEY |
| 80 |
from gkeys.seed import Seeds, decoder |
| 81 |
-from gkeys.fileops import ensure_dirs |
| 82 |
+ |
| 83 |
+demandload( |
| 84 |
+ "json:load", |
| 85 |
+ "gkeys.exception:UpdateDbError", |
| 86 |
+ "gkeys.fileops:ensure_dirs", |
| 87 |
+) |
| 88 |
|
| 89 |
|
| 90 |
class SeedHandler(object): |
| 91 |
|
| 92 |
diff --git a/gkeys/gkeys/utils.py b/gkeys/gkeys/utils.py |
| 93 |
index 92abc50..64f11aa 100644 |
| 94 |
--- a/gkeys/gkeys/utils.py |
| 95 |
+++ b/gkeys/gkeys/utils.py |
| 96 |
@@ -24,10 +24,15 @@ Utility functions''' |
| 97 |
|
| 98 |
import types |
| 99 |
import re |
| 100 |
-import os |
| 101 |
-import sys |
| 102 |
-import locale |
| 103 |
-import codecs |
| 104 |
+ |
| 105 |
+from snakeoil.demandload import demandload |
| 106 |
+ |
| 107 |
+demandload( |
| 108 |
+ "os", |
| 109 |
+ "sys", |
| 110 |
+ "locale", |
| 111 |
+ "codecs", |
| 112 |
+) |
| 113 |
|
| 114 |
try: |
| 115 |
StringTypes = types.StringTypes |
Archives