Skip to content

Commit 1d8269f

Browse files
authored
Merge pull request RustPython#4366 from branai/eval-whitespaces
Fix eval doesn't work correctly
2 parents 68d2695 + 63b982b commit 1d8269f

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

Lib/test/test_string_literals.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ def test_template(self):
7878
for c in TEMPLATE:
7979
assert c == '\n' or ' ' <= c <= '~', repr(c)
8080

81-
# TODO: RUSTPYTHON
82-
@unittest.expectedFailure
8381
def test_eval_str_normal(self):
8482
self.assertEqual(eval(""" 'x' """), 'x')
8583
self.assertEqual(eval(r""" '\x01' """), chr(1))
@@ -133,8 +131,6 @@ def test_eval_str_invalid_escape(self):
133131
self.assertEqual(exc.lineno, 1)
134132
self.assertEqual(exc.offset, 1)
135133

136-
# TODO: RUSTPYTHON
137-
@unittest.expectedFailure
138134
def test_eval_str_raw(self):
139135
self.assertEqual(eval(""" r'x' """), 'x')
140136
self.assertEqual(eval(r""" r'\x01' """), '\\' + 'x01')
@@ -146,8 +142,6 @@ def test_eval_str_raw(self):
146142
self.assertEqual(eval(r""" r'\U0001d120' """), '\\' + 'U0001d120')
147143
self.assertEqual(eval(""" r'\U0001d120' """), chr(0x1d120))
148144

149-
# TODO: RUSTPYTHON
150-
@unittest.expectedFailure
151145
def test_eval_bytes_normal(self):
152146
self.assertEqual(eval(""" b'x' """), b'x')
153147
self.assertEqual(eval(r""" b'\x01' """), byte(1))
@@ -188,8 +182,6 @@ def test_eval_bytes_invalid_escape(self):
188182
self.assertEqual(exc.filename, '<string>')
189183
self.assertEqual(exc.lineno, 1)
190184

191-
# TODO: RUSTPYTHON
192-
@unittest.expectedFailure
193185
def test_eval_bytes_raw(self):
194186
self.assertEqual(eval(""" br'x' """), b'x')
195187
self.assertEqual(eval(""" rb'x' """), b'x')
@@ -216,8 +208,6 @@ def test_eval_bytes_raw(self):
216208
self.assertRaises(SyntaxError, eval, """ rrb'' """)
217209
self.assertRaises(SyntaxError, eval, """ rbb'' """)
218210

219-
# TODO: RUSTPYTHON
220-
@unittest.expectedFailure
221211
def test_eval_str_u(self):
222212
self.assertEqual(eval(""" u'x' """), 'x')
223213
self.assertEqual(eval(""" U'\u00e4' """), 'ä')

vm/src/stdlib/builtins.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ mod builtins {
265265

266266
vm.new_exception_msg(vm.ctx.exceptions.syntax_error.to_owned(), msg)
267267
})?;
268-
Ok(Either::A(vm.ctx.new_str(source)))
268+
Ok(Either::A(vm.ctx.new_str(source.trim_start())))
269269
}
270270
Either::B(code) => Ok(Either::B(code)),
271271
}?;

0 commit comments

Comments
 (0)