From c98f8ba2ab9d0d39dcb0df2cea655bc45cfa2d98 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Thu, 19 Oct 2017 09:55:50 -0400 Subject: [PATCH] Typos --- waflib/Runner.py | 2 +- waflib/extras/buildcopy.py | 2 +- waflib/extras/javatest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 waflib/extras/javatest.py diff --git a/waflib/Runner.py b/waflib/Runner.py index 96ad6e05..bb4c2483 100644 --- a/waflib/Runner.py +++ b/waflib/Runner.py @@ -433,7 +433,7 @@ class Parallel(object): self.skip(tsk) self.add_more_tasks(tsk) elif st == Task.CANCEL_ME: - # A dependency problem has occured, and the + # A dependency problem has occurred, and the # build is most likely run with `waf -k` if Logs.verbose > 1: self.error.append(tsk) diff --git a/waflib/extras/buildcopy.py b/waflib/extras/buildcopy.py index 5f77bc59..e742e540 100644 --- a/waflib/extras/buildcopy.py +++ b/waflib/extras/buildcopy.py @@ -66,7 +66,7 @@ class buildcopy(Task.Task): """ Copy for each pair `n` in `node_pairs`: n[0] -> n[1]. - Attribute `node_pairs` should contain a list of tuples describing source an target: + Attribute `node_pairs` should contain a list of tuples describing source and target: node_pairs = [(in, out), ...] diff --git a/waflib/extras/javatest.py b/waflib/extras/javatest.py old mode 100644 new mode 100755 index 3b5be80e..979b8d82 --- a/waflib/extras/javatest.py +++ b/waflib/extras/javatest.py @@ -8,7 +8,7 @@ task via the **javatest** feature. This gives the possibility to run unit test and have them integrated into the standard waf unit test environment. It has been tested with TestNG and JUnit -but should be easily expandable to other framework given the flexibility of +but should be easily expandable to other frameworks given the flexibility of ut_str provided by the standard waf unit test environment. Example usage: