move sourcefile patching in utils

stonebig · stonebig · commit 64865df1290a · 2015-02-09T15:06:28.000+01:00
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -306,6 +306,23 @@ def patch_shebang_line(fname, pad=b' '):
         print("failed to patch", fname)
 
 
+# =============================================================================
+# Patch sourcefile (instead of forking packages)
+# =============================================================================
+def patch_sourcefile(fname, in_text, out_text, silent_mode=False):
+    """Replace a string in a source file"""
+    import io
+    if osp.isfile(fname) and not in_text == out_text:
+        with io.open(fname, 'r') as fh:
+            content = fh.read()
+        new_content = content.replace(in_text, out_text)
+        if not new_content == content:
+            if not silent_mode:
+                print("patching " , fname, "from", in_text, "to", out_text)
+            with io.open(fname, 'wt') as fh:
+                fh.write(new_content)
+
+
 # =============================================================================
 # Extract functions
 # =============================================================================
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -390,20 +390,11 @@ def install(self, package, install_options=None):
             import glob
             for ffname in glob.glob(r'%s\Scripts\*.exe' % self.target):
                 utils.patch_shebang_line(ffname)
-            do_replace = self.target + (r"\Lib\site-packages\pip\_vendor" +
-                         r"\distlib\scripts.py"  )
-            print("do_replace" , do_replace)
-            fh = open(do_replace,"r")
-            the_thing =  fh.read()             
-            fh.close()
-            the_thing_after = the_thing.replace(
+            utils.patch_sourcefile(
+              self.target + (
+              r"\Lib\site-packages\pip\_vendor\distlib\scripts.py"),
               " executable = get_executable()",
-              " executable = os.path.join(os.path.basename(get_executable()))") 
-            if not the_thing_after == the_thing:
-                print("do_replace_ok" , do_replace)
-                fh = open(do_replace,"w")
-                fh.write(the_thing_after)
-                fh.close()
+              " executable = os.path.join(os.path.basename(get_executable()))")
 
     def handle_specific_packages(self, package):
         """Packages requiring additional configuration"""
