Spelling fixes (#1397)

19 files changed, 30 insertions, 30 deletions

diff --git a/doc/user_guide/run.rst b/doc/user_guide/run.rst
index fb8ebdc4b..2adc28dd3 100644
--- a/doc/user_guide/run.rst
+++ b/doc/user_guide/run.rst
@@ -162,7 +162,7 @@ exit code  meaning                    stderr stream message
 8          refactor message issued
 16         convention message issued
 32         usage error                - "internal error while receiving results\
-                                        from child linter" "Error occured,
+                                        from child linter" "Error occurred,
                                         stopping the linter."
                                       - "<return of linter.help()>"
                                       - "Jobs number <#> should be greater \
diff --git a/elisp/pylint.el b/elisp/pylint.el
index 2a447e38a..5d4d31ab4 100644
--- a/elisp/pylint.el
+++ b/elisp/pylint.el
@@ -50,7 +50,7 @@
   "The most recent PYLINT buffer.
 A PYLINT buffer becomes most recent when you select PYLINT mode in it.
 Notice that using \\[next-error] or \\[compile-goto-error] modifies
-`complation-last-buffer' rather than `pylint-last-buffer'.")
+`completion-last-buffer' rather than `pylint-last-buffer'.")
 
 (defconst pylint-regexp-alist
   (let ((base "^\\(.*\\):\\([0-9]+\\):\s+\\(\\[%s.*\\)$"))
@@ -240,7 +240,7 @@ output buffer, to go to the lines where pylint found matches.
               ((boundp 'python-mode-map) python-mode-map))))
   
     (define-key map [menu-bar Python pylint-separator]
-      '("--" . pylint-seperator))
+      '("--" . pylint-separator))
     (define-key map [menu-bar Python next-error]
       '("Next error" . next-error))
     (define-key map [menu-bar Python prev-error]
diff --git a/pylint/checkers/refactoring.py b/pylint/checkers/refactoring.py
index 5e5eedf1f..33807e5ec 100644
--- a/pylint/checkers/refactoring.py
+++ b/pylint/checkers/refactoring.py
@@ -695,7 +695,7 @@ class LenChecker(checkers.BaseChecker):
 
             if error_detected:
                 parent = node.parent
-                # traverse the AST to figure out if this comparisson was part of
+                # traverse the AST to figure out if this comparison was part of
                 # a test condition
                 while parent and not _node_is_test_condition(parent):
                     parent = parent.parent
diff --git a/pylint/checkers/strings.py b/pylint/checkers/strings.py
index bb99ed8d6..8135b4122 100644
--- a/pylint/checkers/strings.py
+++ b/pylint/checkers/strings.py
@@ -278,7 +278,7 @@ class StringFormatChecker(BaseChecker):
                     else:
                         # One of the keys was something other than a
                         # constant.  Since we can't tell what it is,
-                        # supress checks for missing keys in the
+                        # suppress checks for missing keys in the
                         # dictionary.
                         unknown_keys = True
                 if not unknown_keys:
diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
index 7371af0b1..95cd2b46f 100644
--- a/pylint/checkers/variables.py
+++ b/pylint/checkers/variables.py
@@ -1274,7 +1274,7 @@ class VariablesChecker3k(VariablesChecker):
 
     def _check_classdef_metaclasses(self, klass, parent_node):
         if not klass._metaclass:
-            # Skip if this class doesn't use explictly a metaclass, but inherits it from ancestors
+            # Skip if this class doesn't use explicitly a metaclass, but inherits it from ancestors
             return []
 
         consumed = []  # [(scope_locals, consumed_key)]
diff --git a/pylint/config.py b/pylint/config.py
index 455a10364..d4be610c3 100644
--- a/pylint/config.py
+++ b/pylint/config.py
@@ -297,10 +297,10 @@ class Option(optparse.Option):
         # value(s) are bogus.
         value = self.convert_value(opt, value)
         if self.type == 'named':
-            existant = getattr(values, self.dest)
-            if existant:
-                existant.update(value)
-                value = existant
+            existent = getattr(values, self.dest)
+            if existent:
+                existent.update(value)
+                value = existent
         # And then take whatever action is expected of us.
         # This is a separate method to make life easier for
         # subclasses to add new actions.
diff --git a/pylint/extensions/docparams.py b/pylint/extensions/docparams.py
index b1ca080de..43e46351d 100644
--- a/pylint/extensions/docparams.py
+++ b/pylint/extensions/docparams.py
@@ -29,7 +29,7 @@ class DocstringParameterChecker(BaseChecker):
       the documentation, i.e. also report documented parameters that are missing
       in the signature. This is important to find cases where parameters are
       renamed only in the code, not in the documentation.
-    * Check that all explicity raised exceptions in a function are documented
+    * Check that all explicitly raised exceptions in a function are documented
       in the function docstring. Caught exceptions are ignored.
 
     Activate this checker by adding the line::
diff --git a/pylint/extensions/overlapping_exceptions.py b/pylint/extensions/overlapping_exceptions.py
index 3e3d1c157..c231ba354 100644
--- a/pylint/extensions/overlapping_exceptions.py
+++ b/pylint/extensions/overlapping_exceptions.py
@@ -16,7 +16,7 @@ from pylint.checkers.exceptions import _annotated_unpack_infer
 
 class OverlappingExceptionsChecker(checkers.BaseChecker):
     """Checks for two or more exceptions in the same exception handler
-    clause that are identical or parts of the same inheritence hierarchy
+    clause that are identical or parts of the same inheritance hierarchy
     (i.e. overlapping)."""
 
     __implements__ = interfaces.IAstroidChecker
diff --git a/pylint/lint.py b/pylint/lint.py
index 258bfdc3b..537d6f250 100644
--- a/pylint/lint.py
+++ b/pylint/lint.py
@@ -138,7 +138,7 @@ MSGS = {
               'traceback. Please report such errors !'),
     'F0010': ('error while code parsing: %s',
               'parse-error',
-              'Used when an exception occured while building the Astroid '
+              'Used when an exception occurred while building the Astroid '
               'representation which could be handled by astroid.'),
 
     'I0001': ('Unable to run raw checkers on built-in module %s',
@@ -253,8 +253,8 @@ class PyLinter(config.OptionsManagerMixIn,
     * handle message activation / deactivation at the module level
     * handle some basic but necessary stats'data (number of classes, methods...)
 
-    IDE plugins developpers: you may have to call
-    `astroid.builder.MANAGER.astroid_cache.clear()` accross run if you want
+    IDE plugin developers: you may have to call
+    `astroid.builder.MANAGER.astroid_cache.clear()` across runs if you want
     to ensure the latest code version is actually checked.
     """
 
@@ -638,7 +638,7 @@ class PyLinter(config.OptionsManagerMixIn,
                     meth = self._options_methods[opt]
                 except KeyError:
                     meth = self._bw_options_methods[opt]
-                    # found a "(dis|en)able-msg" pragma deprecated suppresssion
+                    # found a "(dis|en)able-msg" pragma deprecated suppression
                     self.add_message('deprecated-pragma', line=start[0],
                                      args=(opt, opt.replace('-msg', '')))
                 for msgid in utils._splitstrip(value):
@@ -785,7 +785,7 @@ class PyLinter(config.OptionsManagerMixIn,
             child.join()
 
         if failed:
-            print("Error occured, stopping the linter.", file=sys.stderr)
+            print("Error occurred, stopping the linter.", file=sys.stderr)
             sys.exit(32)
 
     def _parallel_check(self, files_or_modules):
diff --git a/pylint/test/functional/confusing_with_statement.py b/pylint/test/functional/confusing_with_statement.py
index 1444a9795..7b8d494e4 100644
--- a/pylint/test/functional/confusing_with_statement.py
+++ b/pylint/test/functional/confusing_with_statement.py
@@ -16,7 +16,7 @@ with one, two as second:
 with one as first, two():
     pass
 
-# nested with statements; make sure no message is emited
+# nested with statements; make sure no message is emitted
 # this could be a false positive on Py2
 with one as first:
     with two:
diff --git a/pylint/test/functional/init_not_called.py b/pylint/test/functional/init_not_called.py
index ba2d58c09..71f09e484 100644
--- a/pylint/test/functional/init_not_called.py
+++ b/pylint/test/functional/init_not_called.py
@@ -46,7 +46,7 @@ class Init(NoInit):
         self.arg = arg
 
 class NewStyleC(object):
-    """__init__ defined by assignemnt."""
+    """__init__ defined by assignment."""
     def xx_init(self):
         """Initializer."""
         pass
diff --git a/pylint/test/functional/invalid_sequence_index.py b/pylint/test/functional/invalid_sequence_index.py
index 55f1ddbf3..f26a4a583 100644
--- a/pylint/test/functional/invalid_sequence_index.py
+++ b/pylint/test/functional/invalid_sequence_index.py
@@ -181,7 +181,7 @@ def function23():
 
     test[0][0] = 0 # getitem with int and setitem with int, no error
     test[0] = 0 # setitem with int, no error
-    del test[None] # delitem overriden, no error
+    del test[None] # delitem overridden, no error
     del test[0] # delitem with int, no error
 
 def function24():
@@ -197,7 +197,7 @@ def function24():
     # delitem with invalid index
     del test[None] # [invalid-sequence-index]
 
-    test[None][0] = 0 # getitem overriden, no error
+    test[None][0] = 0 # getitem overridden, no error
     test[0][0] = 0 # getitem with int and setitem with int, no error
     test[0] = 0 # setitem with int, no error
     del test[0] # delitem with int, no error
diff --git a/pylint/test/functional/no_self_use.py b/pylint/test/functional/no_self_use.py
index 65e12fa7e..bb3919ec4 100644
--- a/pylint/test/functional/no_self_use.py
+++ b/pylint/test/functional/no_self_use.py
@@ -30,10 +30,10 @@ class Base(object):
 
 
 class Sub(Base):
-    """a concret class"""
+    """a concrete class"""
 
     def check(self, arg):
-        """a concret method, could not be a function since it need
+        """a concrete method, could not be a function since it need
         polymorphism benefits
         """
         return arg == 0
diff --git a/pylint/test/functional/unpacking_non_sequence.py b/pylint/test/functional/unpacking_non_sequence.py
index b1cad3bfd..a674a3796 100644
--- a/pylint/test/functional/unpacking_non_sequence.py
+++ b/pylint/test/functional/unpacking_non_sequence.py
@@ -110,7 +110,7 @@ class TestBase(object):
 class Test(TestBase):
     'child class that overrides `test` method'
     def __init__(self):
-        # no error should be emitted here as `test` is overriden in this class
+        # no error should be emitted here as `test` is overridden in this class
         (self.aaa, self.bbb, self.ccc) = self.test(None)
 
     @staticmethod
diff --git a/pylint/test/input/func_noerror_no_warning_docstring.py b/pylint/test/input/func_noerror_no_warning_docstring.py
index bd30d7ebf..000f2683d 100644
--- a/pylint/test/input/func_noerror_no_warning_docstring.py
+++ b/pylint/test/input/func_noerror_no_warning_docstring.py
@@ -1,4 +1,4 @@
-''' Test for inheritence '''
+''' Test for inheritance '''
 from __future__ import print_function
 __revision__ = 1
 # pylint: disable=too-few-public-methods, using-constant-test
diff --git a/pylint/test/unittest_checker_base.py b/pylint/test/unittest_checker_base.py
index 5d254d743..845cff78f 100644
--- a/pylint/test/unittest_checker_base.py
+++ b/pylint/test/unittest_checker_base.py
@@ -25,7 +25,7 @@ class TestDocstring(CheckerTestCase):
         with self.assertAddsMessages(message):
             self.checker.visit_module(module)
 
-    def test_missing_docstring_emtpy_module(self):
+    def test_missing_docstring_empty_module(self):
         module = astroid.parse("")
         with self.assertNoMessages():
             self.checker.visit_module(module)
diff --git a/pylint/test/unittest_checker_variables.py b/pylint/test/unittest_checker_variables.py
index cbaeaf8c7..a13d30734 100644
--- a/pylint/test/unittest_checker_variables.py
+++ b/pylint/test/unittest_checker_variables.py
@@ -126,7 +126,7 @@ class TestVariablesCheckerWithTearDown(CheckerTestCase):
 
         node = astroid.extract_node("""
         def cb_func(abc):
-             ''' Previous callbacks are overriden. '''
+             ''' Previous callbacks are overridden. '''
         """)
         with self.assertAddsMessages(
                 Message('unused-argument', node=node['abc'], args='abc')):
diff --git a/pylint/test/unittest_lint.py b/pylint/test/unittest_lint.py
index 9afea1bcc..0952d0c7f 100644
--- a/pylint/test/unittest_lint.py
+++ b/pylint/test/unittest_lint.py
@@ -662,7 +662,7 @@ class TestMessagesStore(object):
             msg, checkerref=False)
 
     def test_message_help_minmax(self, store):
-        # build the message manually to be python version independant
+        # build the message manually to be python version independent
         msg = store.check_message_id('E1234')
         self._compare_messages(
             ''':duplicate-keyword-arg (E1234): *Duplicate keyword argument %r in %s call*
diff --git a/pylint/utils.py b/pylint/utils.py
index 328da2c4b..1ace59392 100644
--- a/pylint/utils.py
+++ b/pylint/utils.py
@@ -534,8 +534,8 @@ class FileState(object):
         self._collect_block_lines(msgs_store, module_node, orig_state)
 
     def _collect_block_lines(self, msgs_store, node, msg_state):
-        """Recursivly walk (depth first) AST to collect block level options line
-        numbers.
+        """Recursively walk (depth first) AST to collect block level options
+        line numbers.
         """
         for child in node.get_children():
             self._collect_block_lines(msgs_store, child, msg_state)