This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-utilities.git
The following commit(s) were added to refs/heads/master by this push:
new 2f52d3d chore: fix spelling and grammar (#78)
2f52d3d is described below
commit 2f52d3d813b8412b15ead39b6ea7a94f9f236152
Author: John Bampton <[email protected]>
AuthorDate: Tue Mar 9 22:05:54 2021 +1000
chore: fix spelling and grammar (#78)
---
CONTRIBUTING.md | 4 ++--
scancode/README.md | 2 +-
scancode/lib/gitwildmatch.py | 30 +++++++++++++++---------------
scancode/lib/pathspec.py | 2 +-
scancode/lib/util.py | 8 ++++----
scancode/travis.cfg | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 400151f..e84e736 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@
# Contributing to Apache OpenWhisk
-Anyone can contribute to the OpenWhisk project and we welcome your
contributions.
+Anyone can contribute to the OpenWhisk project, and we welcome your
contributions.
There are multiple ways to contribute: report bugs, improve the docs, and
contribute code, but you must follow these prerequisites and guidelines:
@@ -48,7 +48,7 @@ We look forward to your contributions!
Please raise any bug reports or enhancement requests on the respective project
repository's GitHub issue tracker. Be sure to search the list to see if your
issue has already been raised.
-A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong. Provide as much context as possible so we can
try to recreate the issue.
+A good bug report is one that make it easy for us to understand what you were
trying to do and what went wrong. Provide as much context as possible, so we
can try to recreate the issue.
A good enhancement request comes with an explanation of what you are trying to
do and how that enhancement would help you.
diff --git a/scancode/README.md b/scancode/README.md
index cfd1bc0..2adc0eb 100644
--- a/scancode/README.md
+++ b/scancode/README.md
@@ -62,7 +62,7 @@ These include:
### [Excludes]
-List of paths (inclusive of subdirectories) to exlude from code scanning.
+List of paths (inclusive of subdirectories) to exclude from code scanning.
### [Regex]
diff --git a/scancode/lib/gitwildmatch.py b/scancode/lib/gitwildmatch.py
index 5076bd3..af72a56 100644
--- a/scancode/lib/gitwildmatch.py
+++ b/scancode/lib/gitwildmatch.py
@@ -121,7 +121,7 @@ class GitWildMatchPattern(RegexPattern):
if not pattern_segs[-1] and len(pattern_segs) > 1:
# A pattern ending with a slash ('/') will
match all descendant
# paths if it is a directory but not if it is a
regular file.
- # This is equivilent to "{pattern}/**". So, set
last segment to
+ # This is equivalent to "{pattern}/**". So, set
last segment to
# double asterisks to include all descendants.
pattern_segs[-1] = '**'
@@ -224,28 +224,28 @@ class GitWildMatchPattern(RegexPattern):
regex += '[^/]'
elif char == '[':
- # Braket expression wildcard. Except for the
beginning
- # exclamation mark, the whole braket expression
can be used
+ # Bracket expression wildcard. Except for the
beginning
+ # exclamation mark, the whole bracket
expression can be used
# directly as regex but we have to find where
the expression
# ends.
# - "[][!]" matchs ']', '[' and '!'.
# - "[]-]" matchs ']' and '-'.
# - "[!]a-]" matchs any character except ']',
'a' and '-'.
j = i
- # Pass brack expression negation.
+ # Pass bracket expression negation.
if j < end and pattern[j] == '!':
j += 1
- # Pass first closing braket if it is at the
beginning of the
+ # Pass first closing bracket if it is at the
beginning of the
# expression.
if j < end and pattern[j] == ']':
j += 1
- # Find closing braket. Stop once we reach the
end or find it.
+ # Find closing bracket. Stop once we reach the
end or find it.
while j < end and pattern[j] != ']':
j += 1
if j < end:
- # Found end of braket expression.
Increment j to be one past
- # the closing braket:
+ # Found end of bracket expression.
Increment j to be one past
+ # the closing bracket:
#
# [...]
# ^ ^
@@ -255,11 +255,11 @@ class GitWildMatchPattern(RegexPattern):
expr = '['
if pattern[i] == '!':
- # Braket expression needs to be
negated.
+ # Bracket expression needs to
be negated.
expr += '^'
i += 1
elif pattern[i] == '^':
- # POSIX declares that the regex
braket expression negation
+ # POSIX declares that the regex
bracket expression negation
# "[^...]" is undefined in a
glob pattern. Python's
# `fnmatch.translate()` escapes
the caret ('^') as a
# literal. To maintain
consistency with undefined behavior,
@@ -267,19 +267,19 @@ class GitWildMatchPattern(RegexPattern):
expr += '\\^'
i += 1
- # Build regex braket expression. Escape
slashes so they are
+ # Build regex bracket expression.
Escape slashes so they are
# treated as literal slashes by regex
as defined by POSIX.
expr += pattern[i:j].replace('\\',
'\\\\')
- # Add regex braket expression to regex
result.
+ # Add regex bracket expression to regex
result.
regex += expr
- # Set i to one past the closing braket.
+ # Set i to one past the closing bracket.
i = j
else:
- # Failed to find closing braket, treat
opening braket as a
- # braket literal instead of as an
expression.
+ # Failed to find closing bracket, treat
opening bracket as a
+ # bracket literal instead of as an
expression.
regex += '\\['
else:
diff --git a/scancode/lib/pathspec.py b/scancode/lib/pathspec.py
index da08db1..2984abb 100644
--- a/scancode/lib/pathspec.py
+++ b/scancode/lib/pathspec.py
@@ -135,7 +135,7 @@ class PathSpec(object):
*follow_links* (:class:`bool` or :data:`None`) optionally is
whether
- to walk symbolik links that resolve to directories. See
+ to walk symbolic links that resolve to directories. See
:func:`~pathspec.util.iter_tree` for more information.
Returns the matched files (:class:`~collections.abc.Iterable` of
diff --git a/scancode/lib/util.py b/scancode/lib/util.py
index ac6e0a9..76cd2a7 100644
--- a/scancode/lib/util.py
+++ b/scancode/lib/util.py
@@ -45,7 +45,7 @@ def iter_tree(root, on_error=None, follow_links=None,
ignore_cycles=True):
exceptions.
*follow_links* (:class:`bool` or :data:`None`) optionally is whether
- to walk symbolik links that resolve to directories. Default is
+ to walk symbolic links that resolve to directories. Default is
:data:`None` for :data:`True`.
*ignore_cycles* (:class:`bool`) ignores any detected cycles during tree
@@ -82,7 +82,7 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error,
follow_links, ignore_cyc
*on_error* (:class:`~collections.abc.Callable` or :data:`None`)
optionally is the error handler for file-system exceptions.
- *follow_links* (:class:`bool`) is whether to walk symbolik links that
+ *follow_links* (:class:`bool`) is whether to walk symbolic links that
resolve to directories.
*ignore_cycles* (:class:`bool`) skips any detected cycles, otherwise
@@ -128,7 +128,7 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error,
follow_links, ignore_cyc
if stat.S_ISDIR(node_stat.st_mode) and (follow_links or not
is_link):
# Child node is a directory, recurse into it and yield
its
- # decendant files.
+ # descendant files.
for file_rel in _iter_tree_next(root_full, node_rel,
memo, on_error, follow_links, ignore_cycles):
yield file_rel
@@ -139,7 +139,7 @@ def _iter_tree_next(root_full, dir_rel, memo, on_error,
follow_links, ignore_cyc
# NOTE: Make sure to remove the canonical (real) path of the directory
# from the ancestors memo once we are done with it. This allows the
# same directory to appear multiple times. If this is not done, the
- # second occurance of the directory will be incorrectly interpreted as
+ # second occurrence of the directory will be incorrectly interpreted as
# a recursion. See
<https://github.com/cpburnz/python-path-specification/pull/7>.
del memo[dir_real]
diff --git a/scancode/travis.cfg b/scancode/travis.cfg
index 8f90563..81c0554 100644
--- a/scancode/travis.cfg
+++ b/scancode/travis.cfg
@@ -34,7 +34,7 @@ ASFMinifiedLicenseHeaderREM.txt
*.yaml=has_block_license, no_trailing_spaces, eol_at_eof, regex_check
*.yml=has_block_license, no_trailing_spaces, eol_at_eof, regex_check
-# List of paths (inclusive of subdirectories) to exlude from code scanning
+# List of paths (inclusive of subdirectories) to exclude from code scanning
[Excludes]
# General exclusions
.bin
