1 |
On Tue, 6 Oct 2015 00:05:50 -0400 |
2 |
Mike Frysinger <vapier@g.o> wrote: |
3 |
|
4 |
> Delete imports that the modules don't actually utilize. |
5 |
> --- |
6 |
> catalyst/base/resume.py | 2 -- |
7 |
> catalyst/fileops.py | 2 ++ |
8 |
> catalyst/targets/grp.py | 3 +-- |
9 |
> catalyst/targets/livecd_stage1.py | 3 +-- |
10 |
> catalyst/targets/livecd_stage2.py | 3 +-- |
11 |
> catalyst/targets/netboot2.py | 3 +-- |
12 |
> 6 files changed, 6 insertions(+), 10 deletions(-) |
13 |
> |
14 |
> diff --git a/catalyst/base/resume.py b/catalyst/base/resume.py |
15 |
> index a03adf3..608f574 100644 |
16 |
> --- a/catalyst/base/resume.py |
17 |
> +++ b/catalyst/base/resume.py |
18 |
> @@ -12,8 +12,6 @@ set, unset, is_set, is_unset, enabled, clear_all |
19 |
> ''' |
20 |
> |
21 |
> import os |
22 |
> -import shutil |
23 |
> -from stat import ST_UID, ST_GID, ST_MODE |
24 |
> import sys |
25 |
> import traceback |
26 |
> |
27 |
> diff --git a/catalyst/fileops.py b/catalyst/fileops.py |
28 |
> index 129d967..8a05985 100644 |
29 |
> --- a/catalyst/fileops.py |
30 |
> +++ b/catalyst/fileops.py |
31 |
> @@ -16,8 +16,10 @@ from stat import ST_UID, ST_GID, ST_MODE |
32 |
> |
33 |
> # NOTE: pjoin and listdir_files are imported here for export |
34 |
> # to other catalyst modules |
35 |
> +# pylint: disable=unused-import |
36 |
> from snakeoil.osutils import (ensure_dirs as snakeoil_ensure_dirs, |
37 |
> pjoin, listdir_files) |
38 |
> +# pylint: enable=unused-import |
39 |
> from catalyst.support import CatalystError |
40 |
> |
41 |
> |
42 |
> diff --git a/catalyst/targets/grp.py b/catalyst/targets/grp.py |
43 |
> index 5a10fff..4814ac6 100644 |
44 |
> --- a/catalyst/targets/grp.py |
45 |
> +++ b/catalyst/targets/grp.py |
46 |
> @@ -8,8 +8,7 @@ import types |
47 |
> import glob |
48 |
> |
49 |
> |
50 |
> -from catalyst.support import (CatalystError, normpath, |
51 |
> - touch, cmd, list_bashify) |
52 |
> +from catalyst.support import (CatalystError, normpath, cmd, |
53 |
> list_bashify) from catalyst.fileops import ensure_dirs |
54 |
> from catalyst.base.stagebase import StageBase |
55 |
> |
56 |
> diff --git a/catalyst/targets/livecd_stage1.py |
57 |
> b/catalyst/targets/livecd_stage1.py index af59ed7..1930df1 100644 |
58 |
> --- a/catalyst/targets/livecd_stage1.py |
59 |
> +++ b/catalyst/targets/livecd_stage1.py |
60 |
> @@ -7,8 +7,7 @@ import os |
61 |
> import types |
62 |
> |
63 |
> |
64 |
> -from catalyst.support import (normpath, |
65 |
> - touch, cmd) |
66 |
> +from catalyst.support import (normpath, cmd) |
67 |
> from catalyst.fileops import ensure_dirs |
68 |
> |
69 |
> from catalyst.base.stagebase import StageBase |
70 |
> diff --git a/catalyst/targets/livecd_stage2.py |
71 |
> b/catalyst/targets/livecd_stage2.py index 77c6613..870dcf9 100644 |
72 |
> --- a/catalyst/targets/livecd_stage2.py |
73 |
> +++ b/catalyst/targets/livecd_stage2.py |
74 |
> @@ -5,8 +5,7 @@ LiveCD stage2 target, builds upon previous LiveCD |
75 |
> stage1 tarball |
76 |
> import os |
77 |
> |
78 |
> -from catalyst.support import (normpath, file_locate, CatalystError, |
79 |
> cmd, |
80 |
> - read_from_clst, touch) |
81 |
> +from catalyst.support import (normpath, file_locate, CatalystError, |
82 |
> cmd) from catalyst.fileops import ensure_dirs |
83 |
> from catalyst.base.stagebase import StageBase |
84 |
> |
85 |
> diff --git a/catalyst/targets/netboot2.py |
86 |
> b/catalyst/targets/netboot2.py index 3305a2a..5de1a74 100644 |
87 |
> --- a/catalyst/targets/netboot2.py |
88 |
> +++ b/catalyst/targets/netboot2.py |
89 |
> @@ -8,8 +8,7 @@ import types |
90 |
> import shutil |
91 |
> from stat import ST_UID, ST_GID, ST_MODE |
92 |
> |
93 |
> -from catalyst.support import (CatalystError, normpath, |
94 |
> - touch, cmd, list_bashify) |
95 |
> +from catalyst.support import (CatalystError, normpath, cmd, |
96 |
> list_bashify) from catalyst.fileops import ensure_dirs |
97 |
> |
98 |
> from catalyst.base.stagebase import StageBase |
99 |
|
100 |
yeah, another one approved :) |
101 |
|
102 |
and Thank you :) |
103 |
|
104 |
-- |
105 |
Brian Dolbec <dolsen> |