Fix tests on Python 2.5

Author: florentx

pep8.py

@@ -1413,6 +1413,8 @@ def check_all(self, expected=None, line_offset=0):
                     self.blank_lines = 0
                     if COMMENT_WITH_NL:
                         # The comment also ends a physical line
+                        text = text.rstrip('\r\n')
+                        self.tokens = [(token_type, text) + token[2:]]
                         self.check_logical()
         return self.report.get_file_results()