Use universal newlines only on python 2.6

Resolves lp:1397266

2 files changed, 17 insertions, 1 deletions

diff --git a/pyflakes/api.py b/pyflakes/api.py
index 3f3899a..379fc20 100644
--- a/pyflakes/api.py
+++ b/pyflakes/api.py
@@ -73,7 +73,16 @@ def checkPath(filename, reporter=None):
     if reporter is None:
         reporter = modReporter._makeDefaultReporter()
     try:
-        with open(filename, 'r') as f:
+        # in Python 2.6, compile() will choke on \r\n line endings. In later
+        # versions of python it's smarter, and we want binary mode to give
+        # compile() the best opportunity to do the right thing WRT text
+        # encodings.
+        if sys.version_info < (2, 7):
+            mode = 'rU'
+        else:
+            mode = 'rb'
+
+        with open(filename, mode) as f:
             codestr = f.read()
         if sys.version_info < (2, 7):
             codestr += '\n'     # Work around for Python <= 2.6
diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
index f82ac62..ad61983 100644
--- a/pyflakes/test/test_api.py
+++ b/pyflakes/test/test_api.py
@@ -449,6 +449,13 @@ x = "%s"
         sourcePath = self.makeTempFile(source)
         self.assertHasErrors(sourcePath, [])
 
+    def test_CRLFLineEndings(self):
+        """
+        Source files with Windows CR LF line endings are parsed successfully.
+        """
+        sourcePath = self.makeTempFile("x = 42\r\n")
+        self.assertHasErrors(sourcePath, [])
+
     def test_misencodedFileUTF8(self):
         """
         If a source file contains bytes which cannot be decoded, this is