Changes for windows 4.0 release

Author: devagupt

pkg/hook-salt.py

@@ -90,20 +90,14 @@
 binaries = BINARIES
 
 def _patch_salt_grains_core_server_id():
-    import subprocess
     import salt.config # must import before salt.grains.core
     import salt.grains.core
     import sys
+    import patch
 
-    with open('pkg/salt.grains.core.patch', 'rb') as fh:
-        patch_data = fh.read()
-
-    process = subprocess.Popen(['patch',
-        '--forward', # ignore patches that appear reversed or already applied
-        '--batch',   # ask no questions
-        salt.grains.core.__file__],
-        stdin=subprocess.PIPE)
-    stdout, stderr = process.communicate(patch_data)
+    pset = patch.fromfile('pkg/salt.grains.core.patch')
+    pset.items[0].target=salt.grains.core.__file__.encode()
+    pset.apply()
     sys.stderr.write('patching complete\n')
 
-_patch_salt_grains_core_server_id()
+_patch_salt_grains_core_server_id()

pkg/salt.grains.core.patch

@@ -30,7 +30,7 @@
 +
 +        import hashlib
 +        md5 = hashlib.md5()
-+        md5.update( f'{id_}'.encode() )
++        md5.update( str(id_).encode() )
 +        id_hash = int( md5.hexdigest(), 16 )
      if id_hash is None:
          # Python < 3.3 or error encountered above