diff --git a/CHANGELOG.md b/CHANGELOG.md index 52a7f6aec..1fec8b7c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Fixed -* +* Replace some unnecessary platform-specific line separation. More details about these changes can be found on our GitHub repo. diff --git a/certbot/display/util.py b/certbot/display/util.py index 91f3bc33c..aa9f0583b 100644 --- a/certbot/display/util.py +++ b/certbot/display/util.py @@ -114,7 +114,7 @@ class FileDisplay(object): message = _wrap_lines(message) self.outfile.write( "{line}{frame}{line}{msg}{line}{frame}{line}".format( - line=os.linesep, frame=SIDE_FRAME, msg=message)) + line='\n', frame=SIDE_FRAME, msg=message)) self.outfile.flush() if pause: if self._can_interact(force_interactive): diff --git a/certbot/reverter.py b/certbot/reverter.py index a7a8a943d..201bdc03d 100644 --- a/certbot/reverter.py +++ b/certbot/reverter.py @@ -178,10 +178,10 @@ class Reverter(object): for path in filepaths: output.append(" {0}".format(path)) - output.append(os.linesep) + output.append('\n') zope.component.getUtility(interfaces.IDisplay).notification( - os.linesep.join(output), force_interactive=True, pause=False) + '\n'.join(output), force_interactive=True, pause=False) return None def add_to_temp_checkpoint(self, save_files, save_notes): @@ -497,9 +497,9 @@ class Reverter(object): os.remove(path) else: logger.warning( - "File: %s - Could not be found to be deleted %s - " - "Certbot probably shut down unexpectedly", - os.linesep, path) + "File: %s - Could not be found to be deleted\n" + " - Certbot probably shut down unexpectedly", + path) except (IOError, OSError): logger.critical( "Unable to remove filepaths contained within %s", file_list)