Merge pull request #4014 from kinow/fix-typos-1

Fix a few typos

awscli/alias.py

@@ -160,7 +160,7 @@ def __init__(self, alias_name, alias_value, session, command_table,
         :param shadow_proxy_command: A built-in command that
             potentially shadows the alias in name. If the alias
             references this command in its value, the alias should proxy
-            to this command as oppposed to proxy to itself in the command
+            to this command as opposed to proxy to itself in the command
             table
         """
         super(ServiceAliasCommand, self).__init__(alias_name, alias_value)

awscli/customizations/argrename.py

@@ -107,7 +107,7 @@
 }
 
 # Same format as ARGUMENT_RENAMES, but instead of renaming the arguments,
-# an alias is created to the original arugment and marked as undocumented.
+# an alias is created to the original argument and marked as undocumented.
 # This is useful when you need to change the name of an argument but you
 # still need to support the old argument.
 HIDDEN_ALIASES = {

awscli/customizations/awslambda.py

@@ -51,7 +51,7 @@ class ZipFileArgumentHoister(object):
 
     Injects a top-level ZipFileArgument into the argument table which maps
     a --zip-file parameter to the underlying ``serialized_name`` ZipFile
-    shape. Repalces the old ZipFile argument with an instance of
+    shape. Replaces the old ZipFile argument with an instance of
     ReplacedZipFileArgument to prevent its usage and recommend the new
     top-level injected parameter.
     """
@@ -104,7 +104,7 @@ class ZipFileArgument(CustomArgument):
     This class injects a ZipFile argument under the specified serialized_name
     parameter. This can be used to take a top level parameter like --zip-file
     and inject it into a nested different parameter like Code so
-    --zip-file foo.zip winds up being serilized as
+    --zip-file foo.zip winds up being serialized as
     { 'Code': { 'ZipFile': <contents of foo.zip> } }.
     """
     def __init__(self, *args, **kwargs):

awscli/customizations/cloudformation/yamlhelper.py

@@ -22,7 +22,7 @@
 def intrinsics_multi_constructor(loader, tag_prefix, node):
     """
     YAML constructor to parse CloudFormation intrinsics.
-    This will return a dictionary with key being the instrinsic name
+    This will return a dictionary with key being the intrinsic name
     """
 
     # Get the actual tag name excluding the first exclamation

awscli/customizations/cloudfront.py

@@ -75,7 +75,7 @@ class PathsArgument(CustomArgument):
     def __init__(self):
         doc = (
             'The space-separated paths to be invalidated.'
-            ' Note: --invalidation-batch and --paths are mututally exclusive.'
+            ' Note: --invalidation-batch and --paths are mutually exclusive.'
         )
         super(PathsArgument, self).__init__('paths', nargs='+', help_text=doc)
 
@@ -88,7 +88,7 @@ def add_to_params(self, parameters, value):
 
 
 class ExclusiveArgument(CustomArgument):
-    DOC = '%s This argument and --%s are mututally exclusive.'
+    DOC = '%s This argument and --%s are mutually exclusive.'
 
     def __init__(self, name, argument_table,
                  exclusive_to='distribution-config', help_text=''):

awscli/customizations/configservice/subscribe.py

@@ -49,7 +49,7 @@ def add_subscribe(command_table, session, **kwargs):
 
 class SubscribeCommand(BasicCommand):
     NAME = 'subscribe'
-    DESCRIPTION = ('Subcribes user to AWS Config by creating an AWS Config '
+    DESCRIPTION = ('Subscribes user to AWS Config by creating an AWS Config '
                    'delivery channel and configuration recorder to track '
                    'AWS resource configurations. The names of the default '
                    'channel and configuration recorder will be default.')

awscli/customizations/configure/addmodel.py

@@ -60,7 +60,7 @@ def get_model_location(session, service_definition, service_name=None):
         and the service definition.
 
     :returns: The path to where are model should be placed based on
-        the service defintion and the current services in botocore.
+        the service definition and the current services in botocore.
     """
     # Add the ServiceModel abstraction over the service json definition to
     # make it easier to work with.

awscli/customizations/emr/helptext.py

@@ -417,7 +417,7 @@
      ' with a KDC in a different realm. This is the cross-realm principal password,'
      ' which must be identical across realms.</li>'
      ' <li><code>ADDomainJoinUser</code> - Required when establishing trust with an Active Directory'
-     ' domain. This is the User logon name of an AD account with sufficient privileges to join resouces to the domain.</li>'
+     ' domain. This is the User logon name of an AD account with sufficient privileges to join resources to the domain.</li>'
      ' <li><code>ADDomainJoinPassword</code> - The AD password for <code>ADDomainJoinUser</code>.</li>')
 
 # end create-cluster options help descriptions

awscli/customizations/history/__init__.py

@@ -68,7 +68,7 @@ def _should_enable_cli_history(session, parsed_args):
         scoped_config = session.get_scoped_config()
     except ProfileNotFound:
         # If the profile does not exist, cli history is definitely not
-        # enabled, but don't let the error get propogated as commands down
+        # enabled, but don't let the error get propagated as commands down
         # the road may handle this such as the configure set command with
         # a --profile flag set.
         return False

awscli/customizations/history/show.py

@@ -278,7 +278,7 @@ def _pformat_http_body(self, body, event_record):
         elif self._is_xml(body):
             # TODO: Figure out a way to minimize the number of times we have
             # to parse the XML. Currently at worst, it will take three times.
-            # One to determine if it is XML, another to stip whitespace, and
+            # One to determine if it is XML, another to strip whitespace, and
             # a third to convert to make it pretty. This is an issue as it
             # can cause issues when there are large XML payloads such as
             # an s3 ListObjects call.

awscli/customizations/paginate.py

@@ -10,7 +10,7 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-"""This module has customizations to unify paging paramters.
+"""This module has customizations to unify paging parameters.
 
 For any operation that can be paginated, we will:
 

awscli/customizations/s3/fileformat.py

@@ -62,10 +62,10 @@ def local_format(self, path, dir_op):
         """
         This function formats the path of local files and returns whether the
         destination will keep its own name or take the source's name along with
-        the editted path.
+        the edited path.
         Formatting Rules:
             1) If a destination file is taking on a source name, it must end
-               with the appropriate operating system seperator
+               with the appropriate operating system separator
 
         General Options:
             1) If the operation is on a directory, the destination file will

awscli/customizations/s3/filegenerator.py

@@ -221,7 +221,7 @@ def _safely_get_file_stats(self, file_path):
             return file_path, {'Size': size, 'LastModified': last_update}
 
     def _validate_update_time(self, update_time, path):
-        # If the update time is None we know we ran into an invalid tiemstamp.
+        # If the update time is None we know we ran into an invalid timestamp.
         if update_time is None:
             warning = create_warning(
                 path=path,
@@ -234,7 +234,7 @@ def _validate_update_time(self, update_time, path):
 
     def normalize_sort(self, names, os_sep, character):
         """
-        The purpose of this function is to ensure that the same path seperator
+        The purpose of this function is to ensure that the same path separator
         is used when sorting.  In windows, the path operator is a backslash as
         opposed to a forward slash which can lead to differences in sorting
         between s3 and a windows machine.

awscli/customizations/s3/fileinfo.py

@@ -22,7 +22,7 @@ class FileInfo(object):
     :param dest: the destination path
     :type dest: string
     :param compare_key: the name of the file relative to the specified
-        directory/prefix.  This variable is used when performing synching
+        directory/prefix.  This variable is used when performing syncing
         or if the destination file is adopting the source file's name.
     :type compare_key: string
     :param size: The size of the file in bytes.

awscli/customizations/s3/filters.py

@@ -79,7 +79,7 @@ class Filter(object):
     """
     def __init__(self, patterns, rootdir, dst_rootdir):
         """
-        :var patterns: A list of patterns. A pattern consits of a list
+        :var patterns: A list of patterns. A pattern consists of a list
             whose first member is a string 'exclude' or 'include'.
             The second member is the actual rule.
         :var rootdir: The root directory where the patterns are evaluated.

awscli/customizations/utils.py

@@ -114,7 +114,7 @@ def _handler(parsed_args, **kwargs):
 
 
 def validate_mutually_exclusive(parsed_args, *groups):
-    """Validate mututally exclusive groups in the parsed args."""
+    """Validate mutually exclusive groups in the parsed args."""
     args_dict = vars(parsed_args)
     all_args = set(arg for group in groups for arg in group)
     if not any(k in all_args for k in args_dict if args_dict[k] is not None):

awscli/topictags.py

@@ -43,7 +43,7 @@ class TopicTagDB(object):
     awscli/topics. Note that tags can have multiple values by delimiting
     values with commas. All tags must be on their own line in the file.
 
-    This class can load a JSON index represeting all topics and their tags,
+    This class can load a JSON index representing all topics and their tags,
     scan all of the topics and store the values of their tags, retrieve the
     tag value for a particular topic, query for all the topics with a specific
     tag and/or value, and save the loaded data back out to a JSON index.

bin/aws_zsh_completer.sh

@@ -11,7 +11,7 @@
 #
 # https://github.com/zsh-users/zsh/commit/edab1d3dbe61da7efe5f1ac0e40444b2ec9b9570
 #
-# zsh relases prior to that version do not export the required env variables!
+# zsh releases prior to that version do not export the required env variables!
 
 autoload -Uz bashcompinit
 bashcompinit -i