Imported Upstream version 4.3.1

ipaplatform/rhel/__init__.py

@@ -20,4 +20,3 @@
 '''
 This module contains RHEL-specific platform files.
 '''
-NAME = 'rhel'

ipaplatform/rhel/constants.py

@@ -7,13 +7,10 @@ This RHEL base platform module exports platform related constants.
 '''
 
 # Fallback to default constant definitions
-from __future__ import absolute_import
-
 from ipaplatform.redhat.constants import RedHatConstantsNamespace
 
 
 class RHELConstantsNamespace(RedHatConstantsNamespace):
-    IPA_ADTRUST_PACKAGE_NAME = "ipa-server-trust-ad"
     IPA_DNS_PACKAGE_NAME = "ipa-server-dns"
 
 constants = RHELConstantsNamespace()

ipaplatform/rhel/paths.py

@@ -23,8 +23,6 @@ in RHEL-based systems.
 '''
 
 # Fallback to default path definitions
-from __future__ import absolute_import
-
 from ipaplatform.redhat.paths import RedHatPathNamespace
 
 

ipaplatform/rhel/services.py

@@ -22,8 +22,6 @@
 Contains RHEL-specific service class implementations.
 """
 
-from __future__ import absolute_import
-
 from ipaplatform.redhat import services as redhat_services
 
 # Mappings from service names as FreeIPA code references to these services
@@ -43,21 +41,21 @@ class RHELService(redhat_services.RedHatService):
 # Function that constructs proper RHEL-specific server classes for services
 # of specified name
 
-def rhel_service_class_factory(name, api=None):
+def rhel_service_class_factory(name):
     if name == 'domainname':
-        return RHELService(name, api)
-    return redhat_services.redhat_service_class_factory(name, api)
+        return RHELService(name)
+    return redhat_services.redhat_service_class_factory(name)
 
 
 # Magicdict containing RHELService instances.
 
 class RHELServices(redhat_services.RedHatServices):
-    def service_class_factory(self, name, api=None):
-        return rhel_service_class_factory(name, api)
+    def service_class_factory(self, name):
+        return rhel_service_class_factory(name)
 
 
 # Objects below are expected to be exported by platform module
 
-timedate_services = redhat_services.timedate_services
+from ipaplatform.redhat.services import timedate_services
 service = rhel_service_class_factory
 knownservices = RHELServices()

ipaplatform/rhel/tasks.py

@@ -21,8 +21,6 @@
 This module contains default RHEL-specific implementations of system tasks.
 '''
 
-from __future__ import absolute_import
-
 from ipaplatform.redhat.tasks import RedHatTaskNamespace