Added base class inheritance

gpoa/gpt/drives.py

@@ -19,7 +19,7 @@
 import json
 from base64 import b64decode
 from Crypto.Cipher import AES
-
+from .base_preference import Parent_preference
 from util.xml import get_xml_root
 
 def decrypt_pass(cpassword):
@@ -93,7 +93,7 @@ def json2drive(json_str):
 
     return drive_obj
 
-class drivemap:
+class drivemap(Parent_preference):
     def __init__(self):
         self.login = None
         self.password = None

gpoa/gpt/envvars.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
+from .base_preference import Parent_preference
 
 from enum import Enum
 
@@ -54,7 +55,7 @@ def merge_envvars(storage, sid, envvar_objects, policy_name):
     for envv in envvar_objects:
         storage.add_envvar(sid, envv, policy_name)
 
-class envvar:
+class envvar(Parent_preference):
     def __init__(self, name, value):
         self.name = name
         self.value = value

gpoa/gpt/files.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
+from .base_preference import Parent_preference
 
 def read_files(filesxml):
     files = list()
@@ -39,7 +40,7 @@ def merge_files(storage, sid, file_objects, policy_name):
     for fileobj in file_objects:
         storage.add_file(sid, fileobj, policy_name)
 
-class fileentry:
+class fileentry(Parent_preference):
     def __init__(self, fromPath):
         self.fromPath = fromPath
 

gpoa/gpt/folders.py

@@ -18,6 +18,7 @@
 
 
 from enum import Enum
+from .base_preference import Parent_preference
 
 
 from util.xml import get_xml_root
@@ -78,7 +79,7 @@ def merge_folders(storage, sid, folder_objects, policy_name):
         storage.add_folder(sid, folder, policy_name)
 
 
-class folderentry:
+class folderentry(Parent_preference):
     def __init__(self, path):
         self.path = path
         self.action = FileAction.CREATE

gpoa/gpt/inifiles.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
+from .base_preference import Parent_preference
 
 def read_inifiles(inifiles_file):
     inifiles = list()
@@ -37,7 +38,7 @@ def merge_inifiles(storage, sid, inifile_objects, policy_name):
     for iniobj in inifile_objects:
         storage.add_ini(sid, iniobj, policy_name)
 
-class inifile:
+class inifile(Parent_preference):
     def __init__(self, path):
         self.path = path
 

gpoa/gpt/networkshares.py

@@ -18,6 +18,7 @@
 
 from util.xml import get_xml_root
 from storage.dconf_registry import Dconf_registry
+from .base_preference import Parent_preference
 
 def read_networkshares(networksharesxml):
     networkshares = list()
@@ -39,7 +40,7 @@ def merge_networkshares(storage, sid, networkshares_objects, policy_name):
     for networkshareobj in networkshares_objects:
         storage.add_networkshare(sid, networkshareobj, policy_name)
 
-class networkshare:
+class networkshare(Parent_preference):
     def __init__(self, name):
         self.name = name
 

gpoa/gpt/printers.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
+from .base_preference import Parent_preference
 
 from util.xml import get_xml_root
 
@@ -60,7 +61,7 @@ def json2printer(json_str):
 
     return prn
 
-class printer:
+class printer(Parent_preference):
     def __init__(self, ptype, name, status):
         '''
         ptype may be one of:

gpoa/gpt/scriptsini.py

@@ -18,7 +18,7 @@
 
 import configparser
 import os
-
+from .base_preference import Parent_preference
 
 def read_scripts(scripts_file):
     scripts = Scripts_lists()
@@ -115,7 +115,7 @@ class Scripts_lists:
             self.get_shutdown_scripts().append(script)
 
 
-class Script:
+class Script(Parent_preference):
     __logon_counter = 0
     __logoff_counter = 0
     __startup_counter = 0

gpoa/gpt/services.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
+from .base_preference import Parent_preference
 
 def read_services(service_file):
     '''
@@ -43,7 +44,7 @@ def merge_services(storage, sid, service_objects, policy_name):
     for srv in service_objects:
         pass
 
-class service:
+class service(Parent_preference):
     def __init__(self, name):
         self.unit = name
         self.servname = None

gpoa/gpt/shortcuts.py

@@ -28,6 +28,7 @@ import json
 from util.windows import transform_windows_path
 from util.xml import get_xml_root
 from util.paths import get_desktop_files_directory
+from .base_preference import Parent_preference
 
 class TargetType(Enum):
     FILESYSTEM = 'FILESYSTEM'
@@ -129,7 +130,7 @@ def find_desktop_entry(binary_path):
     return None
 
 
-class shortcut:
+class shortcut(Parent_preference):
     def __init__(self, dest, path, arguments, name=None, action=None, ttype=TargetType.FILESYSTEM):
         '''
         :param dest: Path to resulting file on file system