diff options
Diffstat (limited to 'src/lib/Server/Generators')
-rw-r--r-- | src/lib/Server/Generators/account.py | 3 | ||||
-rw-r--r-- | src/lib/Server/Generators/cfg.py | 3 | ||||
-rw-r--r-- | src/lib/Server/Generators/fstab.py | 3 | ||||
-rw-r--r-- | src/lib/Server/Generators/servicemgr.py | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/Server/Generators/account.py b/src/lib/Server/Generators/account.py index 2405128f8..8c91676e4 100644 --- a/src/lib/Server/Generators/account.py +++ b/src/lib/Server/Generators/account.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from Bcfg2.Server.Generator import Generator -from Bcfg2.Server.GeneratorUtils import DirectoryBacked +from Bcfg2.Server.Generator import Generator, DirectoryBacked from Bcfg2.Server.Types import ConfigFile class account(Generator): diff --git a/src/lib/Server/Generators/cfg.py b/src/lib/Server/Generators/cfg.py index e2f70b8bc..97b0775e1 100644 --- a/src/lib/Server/Generators/cfg.py +++ b/src/lib/Server/Generators/cfg.py @@ -5,8 +5,7 @@ from re import compile from stat import S_ISDIR, ST_MODE from string import join -from Bcfg2.Server.Generator import Generator -from Bcfg2.Server.GeneratorUtils import DirectoryBacked, FileBacked +from Bcfg2.Server.Generator import Generator, DirectoryBacked, FileBacked from Bcfg2.Server.Metadata import Metadata class FileEntry(FileBacked): diff --git a/src/lib/Server/Generators/fstab.py b/src/lib/Server/Generators/fstab.py index 16e3ae4bf..bb9568ce8 100644 --- a/src/lib/Server/Generators/fstab.py +++ b/src/lib/Server/Generators/fstab.py @@ -2,8 +2,7 @@ from re import compile -from Bcfg2.Server.Generator import Generator -from Bcfg2.Server.GeneratorUtils import DirectoryBacked +from Bcfg2.Server.Generator import Generator, DirectoryBacked from Bcfg2.Server.Types import ConfigFile class fstab(Generator): diff --git a/src/lib/Server/Generators/servicemgr.py b/src/lib/Server/Generators/servicemgr.py index 2e7a480ae..dfee9f224 100644 --- a/src/lib/Server/Generators/servicemgr.py +++ b/src/lib/Server/Generators/servicemgr.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -from Bcfg2.Server.Generator import Generator -from Bcfg2.Server.GeneratorUtils import SingleXMLFileBacked +from Bcfg2.Server.Generator import Generator, SingleXMLFileBacked class ServiceList(SingleXMLFileBacked): pass |