Re: Merging python-work into maint

[Stefano Lattarini]

Hi Peter.

On Monday 12 September 2011, Peter Rosin wrote:
> Den 2011-09-12 11:16 skrev Stefano Lattarini:
> > The python-work branch contains very minimal refactorings, improvements
> > and testsuite enhancements for the Automake python support.  IMHO it could
> > safely merged back into maint.  Here is the commits that would be merged:
> > 
> >  b46debf python: run the 'py-compile' script with $(SHELL)
> >  dd8b570 py-compile: the '--destdir' option now accepts a blank argument
> >  a716df2 python tests: add "unit tests" on py-compile
> >  429b748 py-compile: normalize error and help messages
> >  cd16ceb py-compile: complain on unrecognized options
> >  a2ebf0e py-compile: '--' and non-option arguments terminate the option list
> > 
> > Attached is the result of "git diff maint python-work", for reference.
> > 
> > I will proceed with the merge in a couple of days if there are no
> > objections.
> 
> While I did not look at any of the code, I did read through the text parts
> of the diff.  Below are the nits I found.
> 
Thanks for spotting those; I've fixed them with the attached patch.

Regards,
  Stefano

From c9a6f7e262be9f011862580a07e37091819b6785 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Mon, 12 Sep 2011 18:37:05 +0200
Subject: [PATCH] cosmetics: fix various typos and grammaros

* NEWS: Fix typos.
* tests/py-compile-basic.test: Likewise.
* tests/py-compile-basedir.test: Fix botched wording in comments.
* tests/py-compile-option-terminate.test: Fix typo and incomplete
comment.

Suggestions by Peter Rosin.
---
 ChangeLog                              |   10 ++++++++++
 NEWS                                   |    2 +-
 tests/py-compile-basedir.test          |    4 ++--
 tests/py-compile-basic.test            |    4 ++--
 tests/py-compile-option-terminate.test |    4 ++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 82ea76d..d7eb525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-12  Stefano Lattarini  <address@hidden>
+
+       cosmetics: fix various typos and grammaros
+       * NEWS: Fix typos.
+       * tests/py-compile-basic.test: Likewise.
+       * tests/py-compile-basedir.test: Fix botched wording in comments.
+       * tests/py-compile-option-terminate.test: Fix typo and incomplete
+       comment.
+       Suggestions by Peter Rosin.
+
 2011-09-11  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious failure on fast machines
diff --git a/NEWS b/NEWS
index c68f149..f26b332 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ New in 1.11.0a:
 
   - The py-compile script now accepts empty arguments passed to the options
     `--destdir' and `--basedir', and complains about unrecognized options.
-    Moreover, a non-option argument or a special `--' arguments terminates
+    Moreover, a non-option argument or a special `--' argument terminates
     the list of options.
 
   - A developer that needs to pass specific flags to configure at "make
diff --git a/tests/py-compile-basedir.test b/tests/py-compile-basedir.test
index d84c790..a277639 100755
--- a/tests/py-compile-basedir.test
+++ b/tests/py-compile-basedir.test
@@ -21,8 +21,8 @@ required=python
 
 set -e
 
-# We'll need to create files in `..', so that we need another level of
-# subdirectory in order not to clutter up the top-level tests directory.
+# We'll need to create files in `..', so we need one more subdirectory
+# level in order not to clutter up the top-level tests directory.
 mkdir sandbox
 cd sandbox
 
diff --git a/tests/py-compile-basic.test b/tests/py-compile-basic.test
index 5d8968c..a7a3f89 100755
--- a/tests/py-compile-basic.test
+++ b/tests/py-compile-basic.test
@@ -26,7 +26,7 @@ set -e
 cp "$testsrcdir/../lib/py-compile" .
 
 cat > foo.py <<'END'
-# Try out some non-trivial sytanx in here.
+# Try out some non-trivial syntax in here.
 
 '''Module docstring'''
 
@@ -48,7 +48,7 @@ bar = baz = (1, (2,), [3, 4]); zardoz = 0;
 END
 
 cat > bar.py <<'END'
-# Import of non-existent modules, or assertion of flase conditions,
+# Import of non-existent modules, or assertion of false conditions,
 # shouldn't cause problems, as it should be enough for the code to
 # be syntactically correct.
 import Automake.No.Such.Module
diff --git a/tests/py-compile-option-terminate.test 
b/tests/py-compile-option-terminate.test
index 6fdd1fb..69f9bb5 100755
--- a/tests/py-compile-option-terminate.test
+++ b/tests/py-compile-option-terminate.test
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that a `--' argument explicitly terminates option list for
-# `py-compile'.
+# Check that a non-option argument and the `--' special argument
+# explicitly terminate the option list for `py-compile'.
 
 required=python
 . ./defs || Exit 1
-- 
1.7.2.3