Merge pull request #397 from jsoref/spelling

spelling fixes

6 files changed, 11 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ef29082..6724763b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@ Changelog
 
 ### 4.2.0
 - Added option "NOQA" Do not wrap lines, but add a noqa statement at the end
-- Added support for runnning isort recursively, simply with a standalone `isort` command
+- Added support for running isort recursively, simply with a standalone `isort` command
 - Added support to run isort library as a module
 - Added compatibility for Python 3.5
 - Fixed performance issue (#338) when running on project with lots of skipped directories
@@ -43,5 +43,5 @@ Changelog
 
 ### 4.2.2
 - Give an error message when isort is unable to determine where to place a module
-- Allow imports to be sorted by module, independant of import_type, when `force_sort_within_sections` option is set
+- Allow imports to be sorted by module, independent of import_type, when `force_sort_within_sections` option is set
 - Fixed an issue that caused Python files with 2 top comments not to be sorted
diff --git a/README.rst b/README.rst
index b58a3ac2..db35bfb9 100644
--- a/README.rst
+++ b/README.rst
@@ -381,7 +381,7 @@ to your preference:
 
     sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER
 
-You also can define your own sections and thier order.
+You also can define your own sections and their order.
 
 Example:
 
diff --git a/isort/isort.py b/isort/isort.py
index f770fb52..98226c9b 100644
--- a/isort/isort.py
+++ b/isort/isort.py
@@ -805,10 +805,10 @@ class SortImports(object):
                         )
                     root = self.imports[placed_module][import_type]
                     for import_name in imports:
-                        associated_commment = nested_comments.get(import_name)
-                        if associated_commment:
-                            self.comments['nested'].setdefault(import_from, {})[import_name] = associated_commment
-                            comments.pop(comments.index(associated_commment))
+                        associated_comment = nested_comments.get(import_name)
+                        if associated_comment:
+                            self.comments['nested'].setdefault(import_from, {})[import_name] = associated_comment
+                            comments.pop(comments.index(associated_comment))
                     if comments:
                         self.comments['from'].setdefault(import_from, []).extend(comments)
 
diff --git a/isort/main.py b/isort/main.py
index f276f282..42aa6db1 100755
--- a/isort/main.py
+++ b/isort/main.py
@@ -221,7 +221,7 @@ def create_parser():
     parser.add_argument('-fas', '--force-alphabetical-sort',  action='store_true', dest="force_alphabetical_sort",
                         help='Force all imports to be sorted as a single section')
     parser.add_argument('-fss', '--force-sort-within-sections',  action='store_true', dest="force_sort_within_sections",
-                        help='Force imports to be sorted by module, independant of import_type')
+                        help='Force imports to be sorted by module, independent of import_type')
 
 
     arguments = dict((key, value) for (key, value) in itemsview(vars(parser.parse_args())) if value)
diff --git a/isort/pie_slice.py b/isort/pie_slice.py
index 5cef39b1..d8a35769 100644
--- a/isort/pie_slice.py
+++ b/isort/pie_slice.py
@@ -6,10 +6,10 @@ Copyright (C) 2013  Timothy Edmund Crosley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copie_slice of the Software, and
+the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
 to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copie_slice or
+The above copyright notice and this permission notice shall be included in all copies or
 substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
diff --git a/test_isort.py b/test_isort.py
index bf794a2e..fa9da485 100644
--- a/test_isort.py
+++ b/test_isort.py
@@ -1193,7 +1193,7 @@ def test_same_line_statements():
 
 
 def test_long_line_comments():
-    """Ensure isort correctly handles comments at the end of extreamly long lines"""
+    """Ensure isort correctly handles comments at the end of extremely long lines"""
     test_input = ("from foo.utils.fabric_stuff.live import check_clean_live, deploy_live, sync_live_envdir, "
                   "update_live_app, update_live_cron  # noqa\n"
                   "from foo.utils.fabric_stuff.stage import check_clean_stage, deploy_stage, sync_stage_envdir, "