Merge branch 'Epsirom-master'

mankyd · Apr 25, 2015 · ecf4403 · ecf4403
2 parents ea65016 + c9ba2fe
commit ecf4403
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/htmlmin/parser.py b/htmlmin/parser.py
@@ -265,7 +265,8 @@ def handle_startendtag(self, tag, attrs):
     self._data_buffer.append(self.build_tag(tag, attrs, tag not in NO_CLOSE_TAGS))
 
   def handle_comment(self, data):
-    if not self.remove_comments or data[0] == '!' or re.match(r'^\[if\s', data):
+    if not self.remove_comments or (
+        data and (data[0] == '!' or re.match(r'^\[if\s', data))):
       self._data_buffer.append('<!--{}-->'.format(
           data[1:] if data[0] == '!' else data))
 

diff --git a/htmlmin/tests/tests.py b/htmlmin/tests/tests.py
@@ -114,7 +114,7 @@
     '<body><br><br>   x   </body>',
   ),
   'remove_comments': (
-    '<body> this text should <!-- X --> have comments removed</body>',
+    '<body> this text should <!-- X --> have <!----> comments removed</body>',
     '<body> this text should have comments removed</body>',
   ),
   'keep_comments': (