Skip to content

Commit 247e815

Browse files
authored
Merge pull request RustPython#4359 from yt2b/check_bom
Add BOM check
2 parents 06a815f + 452e3a3 commit 247e815

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Lib/test/test_importlib/source/test_source_encoding.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,10 @@ def test_encoding_on_second_line(self):
7676
source = b"#/usr/bin/python\n" + self.create_source('Latin-1')
7777
self.run_test(source)
7878

79-
# TODO: RUSTPYTHON
80-
@unittest.expectedFailure
8179
# [BOM]
8280
def test_bom(self):
8381
self.run_test(codecs.BOM_UTF8 + self.source_line.encode('utf-8'))
8482

85-
# TODO: RUSTPYTHON
86-
@unittest.expectedFailure
8783
# [BOM and utf-8]
8884
def test_bom_and_utf_8(self):
8985
source = codecs.BOM_UTF8 + self.create_source('utf-8')

compiler/parser/src/lexer.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ where
236236
lxr.window.slide();
237237
lxr.window.slide();
238238
lxr.window.slide();
239+
// TODO: Handle possible mismatch between BOM and explicit encoding declaration.
240+
if let Some('\u{feff}') = lxr.window[0] {
241+
lxr.window.slide();
242+
}
239243
// Start at top row (=1) left column (=1)
240244
lxr.location.reset();
241245
lxr

0 commit comments

Comments
 (0)