diff options
| author | Bernát Gábor <bgabor8@bloomberg.net> | 2020-07-24 07:40:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 07:40:59 +0100 |
| commit | 7385e3c01bc003ffdf77d8f6e842720bd3f6d870 (patch) | |
| tree | 6eff2b12da47817dce85684cb72b8998d43e7169 /src/virtualenv | |
| parent | 3f45db557b22d1b55ad881999580a496da1cfeb9 (diff) | |
| download | virtualenv-7385e3c01bc003ffdf77d8f6e842720bd3f6d870.tar.gz | |
Use \n instead if \r\n as line separator (#1905)
The logging framework will write to a pipe, which then will blindly transform
all carriage returns to carriage return plus line feed, when on Windows. So
injecting the \r\n leaves us with double carriage return.
Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>
Diffstat (limited to 'src/virtualenv')
| -rw-r--r-- | src/virtualenv/__main__.py | 3 | ||||
| -rw-r--r-- | src/virtualenv/config/ini.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/virtualenv/__main__.py b/src/virtualenv/__main__.py index e0e25e4..0995e4c 100644 --- a/src/virtualenv/__main__.py +++ b/src/virtualenv/__main__.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, print_function, unicode_literals import logging -import os import sys from datetime import datetime @@ -52,7 +51,7 @@ class LogSession(object): ) if self.session.activators: lines.append(" activators {}".format(",".join(i.__class__.__name__ for i in self.session.activators))) - return os.linesep.join(lines) + return "\n".join(lines) def run_with_catch(args=None): diff --git a/src/virtualenv/config/ini.py b/src/virtualenv/config/ini.py index c878947..4dec629 100644 --- a/src/virtualenv/config/ini.py +++ b/src/virtualenv/config/ini.py @@ -75,7 +75,7 @@ class IniConfig(object): def epilog(self): msg = "{}config file {} {} (change{} via env var {})" return msg.format( - os.linesep, + "\n", self.config_file, self.STATE[self.has_config_file], "d" if self.is_env_var else "", |