diff --git a/borg/remote.py b/borg/remote.py index fe859ac1f..5da5f9cf8 100644 --- a/borg/remote.py +++ b/borg/remote.py @@ -203,7 +203,7 @@ class RemoteRepository: break r, w, x = select.select(self.r_fds, w_fds, self.x_fds, 1) if x: - raise Exception('FD exception occured') + raise Exception('FD exception occurred') if r: data = os.read(self.stdout_fd, BUFSIZE) if not data: diff --git a/borg/repository.py b/borg/repository.py index 97cdeac04..b760ec0cd 100644 --- a/borg/repository.py +++ b/borg/repository.py @@ -413,7 +413,7 @@ class Repository: self.segments.setdefault(segment, 0) def preload(self, ids): - """Preload objects (only applies to remote repositories + """Preload objects (only applies to remote repositories) """ diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py index e16687ff8..29c6ac1f7 100644 --- a/borg/testsuite/archiver.py +++ b/borg/testsuite/archiver.py @@ -83,7 +83,7 @@ class ArchiverTestCaseBase(BaseTestCase): os.mkdir(self.keys_path) os.mkdir(self.cache_path) with open(self.exclude_file_path, 'wb') as fd: - fd.write(b'input/file2\n# A commment line, then a blank line\n\n') + fd.write(b'input/file2\n# A comment line, then a blank line\n\n') self._old_wd = os.getcwd() os.chdir(self.tmpdir)