Fixes python#29213: regularised EOLs of venv scripts.

vsajip · vsajip · commit db38b6c9a932 · 2017-02-02T19:25:24.000Z
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
@@ -339,19 +339,17 @@ def install_scripts(self, context, path):
                 dstfile = os.path.join(dstdir, f)
                 with open(srcfile, 'rb') as f:
                     data = f.read()
-                if srcfile.endswith('.exe'):
-                    mode = 'wb'
-                else:
-                    mode = 'w'
+                if not srcfile.endswith('.exe'):
                     try:
                         data = data.decode('utf-8')
                         data = self.replace_variables(data, context)
-                    except UnicodeDecodeError as e:
+                        data = data.encode('utf-8')
+                    except UnicodeError as e:
                         data = None
                         logger.warning('unable to copy script %r, '
                                        'may be binary: %s', srcfile, e)
                 if data is not None:
-                    with open(dstfile, mode) as f:
+                    with open(dstfile, 'wb') as f:
                         f.write(data)
                     shutil.copymode(srcfile, dstfile)
 
diff --git a/Lib/venv/scripts/nt/Activate.ps1 b/Lib/venv/scripts/nt/Activate.ps1
@@ -26,7 +26,7 @@ function global:deactivate ([switch]$NonDestructive) {
 }
 
 deactivate -nondestructive
-
+
 $env:VIRTUAL_ENV="__VENV_DIR__"
 
 if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function global:deactivate ([switch]$NonDestructive) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`deactivate -nondestructive`
`29`		`-`
	`29`	`+`
`30`	`30`	`$env:VIRTUAL_ENV="__VENV_DIR__"`
`31`	`31`
`32`	`32`	`if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {`