Add helper function for winservice

salt/utils/saltminionservice.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 import sys
 
 # Import salt libs
-from salt.utils.winservice import Service, instart
+from salt.utils.winservice import service, instart
 import salt
 import salt.defaults.exitcodes
 
@@ -15,7 +15,7 @@ import win32service
 import winerror
 
 
-class MinionService(Service):
+class MinionService(service):
 
     def start(self):
         self.runflag = True

salt/utils/win_osinfo.py

@@ -34,8 +34,11 @@ def os_version_info_ex():
     Helper function to return the OSVersionInfo class
 
     Returns:
-        class: The OsVersionInfo class
+        class: An instance of a class containing version info
     '''
+    if not HAS_WIN32:
+        return
+
     class OSVersionInfo(ctypes.Structure):
         _fields_ = (('dwOSVersionInfoSize', DWORD),
                     ('dwMajorVersion', DWORD),

salt/utils/winservice.py

@@ -30,7 +30,16 @@ def __virtual__():
     return 'winservice'
 
 
-if HAS_WIN32:
+def service():
+    '''
+    Helper function to return the Service class
+
+    Returns:
+        class: An instance of the ServiceFramework class
+    '''
+    if not HAS_WIN32:
+        return
+
     class Service(win32serviceutil.ServiceFramework):
 
         _svc_name_ = '_unNamed'
@@ -78,6 +87,8 @@ if HAS_WIN32:
         def stop(self):
             pass
 
+    return Service()
+
 
 def instart(cls, name, display_name=None, stay_alive=True):
     '''Install and  Start (auto) a Service