Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
diff --git a/Parser/Python.asdl b/Parser/Python.asdl
index 4397d89..00de381 100644
--- a/Parser/Python.asdl
+++ b/Parser/Python.asdl
@@ -98,8 +98,11 @@
comprehension = (expr target, expr iter, expr* ifs)
-- not sure what to call the first argument for raise and except
-
- excepthandler = (expr? type, expr? name, stmt* body)
+ -- TODO(jhylton): Figure out if there is a better way to handle
+ -- lineno and col_offset fields, particularly when
+ -- ast is exposed to Python.
+ excepthandler = (expr? type, expr? name, stmt* body, int lineno,
+ int col_offset)
arguments = (expr* args, identifier? vararg,
identifier? kwarg, expr* defaults)