mirror of
https://github.com/python/cpython.git
synced 2025-01-06 08:34:26 +08:00
d76c8da098
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r73623 | benjamin.peterson | 2009-06-28 12:22:03 -0500 (Sun, 28 Jun 2009) | 58 lines
Merged revisions 73004,73439,73496,73509,73529,73564,73576-73577,73595-73596,73605 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73004 | jeffrey.yasskin | 2009-05-28 22:44:31 -0500 (Thu, 28 May 2009) | 5 lines
Fix nearly all compilation warnings under Apple gcc-4.0. Tested with OPT="-g
-Wall -Wstrict-prototypes -Werror" in both --with-pydebug mode and --without.
There's still a batch of non-prototype warnings in Xlib.h that I don't know how
to fix.
........
r73439 | benjamin.peterson | 2009-06-15 19:29:31 -0500 (Mon, 15 Jun 2009) | 1 line
don't mask encoding errors when decoding a string #6289
........
r73496 | vinay.sajip | 2009-06-21 12:37:27 -0500 (Sun, 21 Jun 2009) | 1 line
Issue #6314: logging.basicConfig() performs extra checks on the "level" argument.
........
r73509 | amaury.forgeotdarc | 2009-06-22 14:33:48 -0500 (Mon, 22 Jun 2009) | 2 lines
#4490 Fix sample code run by "python -m xml.sax.xmlreader"
........
r73529 | r.david.murray | 2009-06-23 13:02:46 -0500 (Tue, 23 Jun 2009) | 4 lines
Fix issue 5230 by having pydoc's safeimport check to see if the import
error was thrown from itself in order to decide if the module can't be
found. Thanks to Lucas Prado Melo for collaborating on the fix and tests.
........
r73564 | amaury.forgeotdarc | 2009-06-25 17:29:29 -0500 (Thu, 25 Jun 2009) | 6 lines
#2016 Fix a crash in function call when the **kwargs dictionary is mutated
during the function call setup.
This even gives a slight speedup, probably because tuple allocation
is faster than PyMem_NEW.
........
r73576 | benjamin.peterson | 2009-06-26 18:37:06 -0500 (Fri, 26 Jun 2009) | 1 line
document is_declared_global()
........
r73577 | benjamin.peterson | 2009-06-27 09:16:23 -0500 (Sat, 27 Jun 2009) | 1 line
link to extensive generator docs in the reference manual
........
r73595 | ezio.melotti | 2009-06-27 18:45:39 -0500 (Sat, 27 Jun 2009) | 1 line
stmt and setup can contain multiple statements, see #5896
........
r73596 | ezio.melotti | 2009-06-27 19:07:45 -0500 (Sat, 27 Jun 2009) | 1 line
Fixed a wrong apostrophe
........
r73605 | georg.brandl | 2009-06-28 07:10:18 -0500 (Sun, 28 Jun 2009) | 1 line
Remove stray pychecker directive.
........
................
r73624 | benjamin.peterson | 2009-06-28 12:32:20 -0500 (Sun, 28 Jun 2009) | 1 line
document BufferedIOBase.raw and TextIOBase.buffer
................
69 lines
2.1 KiB
Python
69 lines
2.1 KiB
Python
|
|
import test.support, unittest
|
|
from test.support import TESTFN, unlink
|
|
import os, sys
|
|
|
|
class CodingTest(unittest.TestCase):
|
|
def test_bad_coding(self):
|
|
module_name = 'bad_coding'
|
|
self.verify_bad_module(module_name)
|
|
|
|
def test_bad_coding2(self):
|
|
module_name = 'bad_coding2'
|
|
self.verify_bad_module(module_name)
|
|
|
|
def verify_bad_module(self, module_name):
|
|
self.assertRaises(SyntaxError, __import__, 'test.' + module_name)
|
|
|
|
path = os.path.dirname(__file__)
|
|
filename = os.path.join(path, module_name + '.py')
|
|
fp = open(filename, "rb")
|
|
bytes = fp.read()
|
|
fp.close()
|
|
self.assertRaises(SyntaxError, compile, bytes, filename, 'exec')
|
|
|
|
def test_exec_valid_coding(self):
|
|
d = {}
|
|
exec('# coding: cp949\na = 5\n', d)
|
|
self.assertEqual(d['a'], 5)
|
|
|
|
def test_file_parse(self):
|
|
# issue1134: all encodings outside latin-1 and utf-8 fail on
|
|
# multiline strings and long lines (>512 columns)
|
|
if TESTFN in sys.modules:
|
|
del sys.modules[TESTFN]
|
|
sys.path.insert(0, ".")
|
|
filename = TESTFN + ".py"
|
|
f = open(filename, "w")
|
|
try:
|
|
f.write("# -*- coding: cp1252 -*-\n")
|
|
f.write("'''A short string\n")
|
|
f.write("'''\n")
|
|
f.write("'A very long string %s'\n" % ("X" * 1000))
|
|
f.close()
|
|
|
|
__import__(TESTFN)
|
|
finally:
|
|
f.close()
|
|
unlink(TESTFN+".py")
|
|
unlink(TESTFN+".pyc")
|
|
sys.path.pop(0)
|
|
|
|
def test_error_from_string(self):
|
|
# See http://bugs.python.org/issue6289
|
|
input = "# coding: ascii\n\N{SNOWMAN}".encode('utf-8')
|
|
try:
|
|
compile(input, "<string>", "exec")
|
|
except SyntaxError as e:
|
|
expected = "'ascii' codec can't decode byte 0xe2 in position 16: " \
|
|
"ordinal not in range(128)"
|
|
self.assertTrue(str(e).startswith(expected))
|
|
else:
|
|
self.fail("didn't raise")
|
|
|
|
def test_main():
|
|
test.support.run_unittest(CodingTest)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|