Merge pull request #777 from jinmel/develop

Add option to ignore trailing comments

2 files changed, 10 insertions, 6 deletions

diff --git a/isort/isort.py b/isort/isort.py
index 9c7ed8cf..970117f1 100644
--- a/isort/isort.py
+++ b/isort/isort.py
@@ -278,11 +278,15 @@ class SortImports(object):
 
     def _add_comments(self, comments, original_string=""):
         """
-            Returns a string with comments added
+            Returns a string with comments added if ignore_comments is not set.
         """
-        return comments and "{0}{1} {2}".format(self._strip_comments(original_string)[0],
-                                                self.config['comment_prefix'],
-                                                "; ".join(comments)) or original_string
+
+        if not self.config['ignore_comments']:
+            return comments and "{0}{1} {2}".format(self._strip_comments(original_string)[0],
+                                                    self.config['comment_prefix'],
+                                                    "; ".join(comments)) or original_string
+
+        return comments and self._strip_comments(original_string)[0]
 
     def _wrap(self, line):
         """
diff --git a/isort/settings.py b/isort/settings.py
index 8d6be959..f6ef1c25 100644
--- a/isort/settings.py
+++ b/isort/settings.py
@@ -152,8 +152,8 @@ default = {'force_to_top': [],
            'ignore_whitespace': False,
            'no_lines_before': [],
            'no_inline_sort': False,
-           'safety_excludes': True,
-           }
+           'ignore_comments': False,
+           'safety_excludes': True}
 
 
 @lru_cache()