Merged revisions 5211-5215,5227,5229,5231-5234,5262-5271,5274-5276,5278-5279,5281-5285 via svnmerge from
https://jython.svn.sourceforge.net/svnroot/jython/trunk/jython

................
r5211 | pjenvey | 2008-08-20 01:34:29 +0200 (Wed, 20 Aug 2008) | 2 lines

small cleanup
................
r5212 | pjenvey | 2008-08-20 02:28:55 +0200 (Wed, 20 Aug 2008) | 4 lines

o rename unmarshalCode -> readCode, as it doesn't relate to Python's marshal
o zipimport shouldn't cacheCompiledSource (it's just been silently failing),
and use java enums
................
r5213 | nriley | 2008-08-20 06:33:02 +0200 (Wed, 20 Aug 2008) | 1 line

Run Jython regrtest (on Windows) with bytecode verification; support -J, --jdb, -- on Windows too.
................
r5214 | nriley | 2008-08-20 07:26:20 +0200 (Wed, 20 Aug 2008) | 1 line

Turned out those quotes were useful after all.
................
r5215 | zyasoft | 2008-08-20 08:54:10 +0200 (Wed, 20 Aug 2008) | 5 lines

A class definition needs to have __module__ set in frame locals, so
that it is accessible by a metaclass, if defined.

Fixes test_advice in zope.interfaces
................
r5227 | pjenvey | 2008-08-21 01:01:42 +0200 (Thu, 21 Aug 2008) | 3 lines

rewrite the subx joiner yet again: this time exactly as CPython does it, with
__getslice__ and join. fixes a string subclass corner case
................
r5229 | leosoto | 2008-08-21 05:23:28 +0200 (Thu, 21 Aug 2008) | 1 line

Fixing #1095 for old-style classes. Thanks to Anselm Kruls for the patch.
................
r5231 | pjenvey | 2008-08-21 21:44:29 +0200 (Thu, 21 Aug 2008) | 3 lines

make cStringIO thread safe as unfortunately the CPython GIL guarantees it, as
does the pure python version. add cStringIO.In/OutputType
................
r5232 | pjenvey | 2008-08-22 01:59:46 +0200 (Fri, 22 Aug 2008) | 1 line

document TypeError vs AttributeError here
................
r5233 | fwierzbicki | 2008-08-22 17:31:56 +0200 (Fri, 22 Aug 2008) | 2 lines

Switch "type"->"kind" for the compile parameter value which specifies the kind of parse/compile "exec", "eval", or "single". CPython's source uses "kind" and other parts of Jython use this term as well.
................
r5234 | pjenvey | 2008-08-22 22:16:59 +0200 (Fri, 22 Aug 2008) | 3 lines

fix unicode __add__ and repeat always forcing the basic plane on the result --
can't optimize for strs when unicode also uses these methods
................
r5262 | fwierzbicki | 2008-08-29 14:11:43 +0200 (Fri, 29 Aug 2008) | 3 lines

Leaving out two of the harder parts of test_inspect out for now
(with comments to come back to them later).
................
r5263 | fwierzbicki | 2008-08-29 14:14:12 +0200 (Fri, 29 Aug 2008) | 3 lines

Initialized merge tracking via "svnmerge" with revisions "1-5209" from
https://jython.svn.sourceforge.net/svnroot/jython/branches/nowalker
................
r5264 | fwierzbicki | 2008-08-29 15:47:16 +0200 (Fri, 29 Aug 2008) | 168 lines

Merged revisions 5210,5216-5220,5223-5226,5228,5230,5236-5261 via svnmerge from
https://jython.svn.sourceforge.net/svnroot/jython/branches/nowalker

........
r5210 | fwierzbicki | 2008-08-19 17:43:06 -0400 (Tue, 19 Aug 2008) | 5 lines

Work to date on the one pass grammar. Not ready for others to look at really.
If you really want to try it note that you need to comment out parts of site.py
and os.py to get things to work. They *almost* parse and compile, but not
quite, and they are basic dependencies for Jython to run.
........
r5216 | fwierzbicki | 2008-08-20 08:10:26 -0400 (Wed, 20 Aug 2008) | 2 lines

Much better BoolOp.
........
r5217 | fwierzbicki | 2008-08-20 10:06:30 -0400 (Wed, 20 Aug 2008) | 2 lines

Fix "del".
........
r5218 | fwierzbicki | 2008-08-20 10:39:21 -0400 (Wed, 20 Aug 2008) | 2 lines

Dict support.
........
r5219 | fwierzbicki | 2008-08-20 11:23:14 -0400 (Wed, 20 Aug 2008) | 2 lines

Conditional Expression support.
........
r5220 | fwierzbicki | 2008-08-20 11:37:02 -0400 (Wed, 20 Aug 2008) | 2 lines

repr support.
........
r5223 | fwierzbicki | 2008-08-20 15:57:39 -0400 (Wed, 20 Aug 2008) | 2 lines

Start of list comprehensions and generator expressions.
........
r5224 | fwierzbicki | 2008-08-20 15:58:17 -0400 (Wed, 20 Aug 2008) | 2 lines

oops revert build.xml
........
r5225 | fwierzbicki | 2008-08-20 16:57:09 -0400 (Wed, 20 Aug 2008) | 2 lines

re-remove PythonWalker.g from build
........
r5226 | fwierzbicki | 2008-08-20 16:59:44 -0400 (Wed, 20 Aug 2008) | 2 lines

gen expressions and list comps now actually work...
........
r5228 | fwierzbicki | 2008-08-20 22:58:24 -0400 (Wed, 20 Aug 2008) | 2 lines

debugging of some expr_contextType values.
........
r5230 | fwierzbicki | 2008-08-20 23:47:32 -0400 (Wed, 20 Aug 2008) | 2 lines

bugfix on exception and on assign value expr_contextType.
........
r5236 | fwierzbicki | 2008-08-22 19:03:45 -0400 (Fri, 22 Aug 2008) | 2 lines

Bugfix for expr_contextType on assign values.
........
r5237 | fwierzbicki | 2008-08-22 22:33:48 -0400 (Fri, 22 Aug 2008) | 2 lines

Add expr types to BaseTree children.
........
r5238 | fwierzbicki | 2008-08-23 15:19:16 -0400 (Sat, 23 Aug 2008) | 2 lines

BinOp now works in one pass.
........
r5239 | fwierzbicki | 2008-08-23 15:43:19 -0400 (Sat, 23 Aug 2008) | 2 lines

Fine tuning List and Assign col position.
........
r5240 | fwierzbicki | 2008-08-23 19:03:59 -0400 (Sat, 23 Aug 2008) | 5 lines

Make PythonTree's toStringTree more easily comparable with ast/astview.py
output. This will help with the walkerless Python.g, as it doesn't quite
parse ast/astview.py yet.
........
r5241 | fwierzbicki | 2008-08-23 22:04:43 -0400 (Sat, 23 Aug 2008) | 2 lines

Fix lambda without args.
........
r5242 | fwierzbicki | 2008-08-24 05:38:22 -0400 (Sun, 24 Aug 2008) | 2 lines

check for PythonTree in makeStmts.
........
r5243 | fwierzbicki | 2008-08-25 10:21:29 -0400 (Mon, 25 Aug 2008) | 2 lines

Fix generator expressions, rename all "stmts" in Python.g to "stypes".
........
r5244 | fwierzbicki | 2008-08-25 11:25:24 -0400 (Mon, 25 Aug 2008) | 2 lines

Clean up creation of stmtType[] and exprType[].
........
r5245 | fwierzbicki | 2008-08-25 14:44:46 -0400 (Mon, 25 Aug 2008) | 3 lines

Fix build.xml (oops)
Fix Generator Expression assignments and multi-statement simple_stmt.
........
r5246 | fwierzbicki | 2008-08-25 16:36:04 -0400 (Mon, 25 Aug 2008) | 3 lines

Fixed fplist, subscripts (especially extslice) and enable Interactive
and Expression (single and eval). regrtest.py is now running.
........
r5247 | fwierzbicki | 2008-08-25 17:18:03 -0400 (Mon, 25 Aug 2008) | 2 lines

Fix **
........
r5248 | fwierzbicki | 2008-08-25 22:04:27 -0400 (Mon, 25 Aug 2008) | 3 lines

Cleanup: removal of comments, re-format of Python.g and
removal of PYNODE.
........
r5249 | fwierzbicki | 2008-08-26 08:21:42 -0400 (Tue, 26 Aug 2008) | 3 lines

Remove unnecessary constructor on BinOp (now it is just the generated version again)
Remove some whitespace in Python.g
........
r5250 | fwierzbicki | 2008-08-26 11:05:19 -0400 (Tue, 26 Aug 2008) | 2 lines

Moved makeSliceType code to GrammarActions.
........
r5251 | fwierzbicki | 2008-08-26 12:51:15 -0400 (Tue, 26 Aug 2008) | 2 lines

Moved Subscript creation up a rule - fixed a bunch of unit tests.
........
r5252 | fwierzbicki | 2008-08-26 15:37:34 -0400 (Tue, 26 Aug 2008) | 2 lines

Another expr_contextType adjustment.
........
r5253 | fwierzbicki | 2008-08-26 16:17:50 -0400 (Tue, 26 Aug 2008) | 2 lines

checking for bad assignment statements.
........
r5254 | fwierzbicki | 2008-08-26 20:44:35 -0400 (Tue, 26 Aug 2008) | 3 lines

Fix illegal Lambda statements and more illegal assigns. Also raise exceptions
on illegal gen expression arguments.
........
r5255 | fwierzbicki | 2008-08-26 22:38:35 -0400 (Tue, 26 Aug 2008) | 2 lines

Fix for FunctionDef and Call problems.
........
r5256 | fwierzbicki | 2008-08-26 22:47:56 -0400 (Tue, 26 Aug 2008) | 2 lines

whitespace
........
r5257 | fwierzbicki | 2008-08-27 12:07:35 -0400 (Wed, 27 Aug 2008) | 2 lines

revert build.xml after accidently checking in my local copy.
........
r5258 | fwierzbicki | 2008-08-27 15:51:16 -0400 (Wed, 27 Aug 2008) | 2 lines

for not_test, replacing manual tree construction with ->.
........
r5259 | fwierzbicki | 2008-08-27 16:09:39 -0400 (Wed, 27 Aug 2008) | 2 lines

TODO comment.
........
r5260 | fwierzbicki | 2008-08-27 16:35:54 -0400 (Wed, 27 Aug 2008) | 3 lines

Removed XXX comments that no longer apply (special testlists don't
seem to be needed). Removed unused c1 and c2 alias.
........
r5261 | fwierzbicki | 2008-08-27 16:51:19 -0400 (Wed, 27 Aug 2008) | 2 lines

simplify testlist.
........
................
r5265 | nriley | 2008-08-29 21:51:57 +0200 (Fri, 29 Aug 2008) | 1 line

filecmp.py from http://svn.python.org/projects/python/branches/release25-maint/Lib/filecmp.py r66059
................
r5266 | nriley | 2008-08-29 21:53:04 +0200 (Fri, 29 Aug 2008) | 1 line

Close file immediately after comparing it. Fixes test_filecmp on Windows.
................
r5267 | nriley | 2008-08-29 21:55:43 +0200 (Fri, 29 Aug 2008) | 1 line

Correct file position after truncate; similar to CPython's bug . Fixes test_file on Windows.
................
r5268 | nriley | 2008-08-29 21:56:54 +0200 (Fri, 29 Aug 2008) | 1 line

Fix some mispasted docstrings in the grp module.
................
r5269 | nriley | 2008-08-29 21:58:06 +0200 (Fri, 29 Aug 2008) | 1 line

Raise ImportError when attempting to import pwd, grp modules on Windows. Fixes test_tarfile.
................
r5270 | nriley | 2008-08-29 22:41:41 +0200 (Fri, 29 Aug 2008) | 1 line

Revert stubbed out bit from r5210.
................
r5271 | pjenvey | 2008-08-29 23:08:52 +0200 (Fri, 29 Aug 2008) | 3 lines

PEP 338 (jython -m mod) support
patch from Georgy Berdyshev
................
r5274 | zyasoft | 2008-08-30 20:39:59 +0200 (Sat, 30 Aug 2008) | 22 lines

Exposed unicode_toString, str_toString so that Jython code can
directly access the underlying java.lang.String backing our unicode
and str types. This enables writing code like this:

return Normalizer.normalize(unistr.toString(), normalizer_form)

without Jython automatically encoding the string on our behalf. That's
often what we want for CPython compatibility, but not when we are
calling methods like this. (Too bad we need to know.)

Added unicodedata.py and supporting data files UnicodeData.txt and
EastAsianWidth.txt, both from 4.10. (We may wish to update to be more
compliant with Java than Python 2.5.) Because the time it takes to
import, serious refactoring should be considered, including possibly
doing a codegen to Java approach. Currently does not pass MD5 hash
tests in test_unicodedata, which by their nature are highly sensitive.

Added collections.namedtuple. First 2.6 feature. (We should have a few
in Jython 2.5.) This was originally added to support Python version of
unicodedata.py, but is now just included.
................
r5275 | fwierzbicki | 2008-08-31 02:31:36 +0200 (Sun, 31 Aug 2008) | 3 lines

Fixes #1116 -- dotted_attr was calling itself, which does not make
sense with +=.
................
r5276 | fwierzbicki | 2008-08-31 03:00:57 +0200 (Sun, 31 Aug 2008) | 2 lines

Test for more than 2 dotted_attr. See http://bugs.jython.org/issue1116.
................
r5278 | fwierzbicki | 2008-09-01 06:21:27 +0200 (Mon, 01 Sep 2008) | 2 lines

Check for EOF in file_input. Comment cleanup.
................
r5279 | zyasoft | 2008-09-01 08:32:39 +0200 (Mon, 01 Sep 2008) | 6 lines

The compile builtin function now can take an AST node, as produced by
a previous usage of compile with the compiler flag
_ast.PyCF_ONLY_AST. Generally this would be after some modification of
the AST itself. Another 2.6 feature.
................
r5281 | fwierzbicki | 2008-09-02 16:41:10 +0200 (Tue, 02 Sep 2008) | 2 lines

Coding standards and cosmetic changes.
................
r5282 | fwierzbicki | 2008-09-02 16:43:50 +0200 (Tue, 02 Sep 2008) | 2 lines

accidentally commented out call to dump() which is turned off by default anyway.
................
r5283 | fwierzbicki | 2008-09-03 02:19:22 +0200 (Wed, 03 Sep 2008) | 2 lines

Remove unused file.
................
r5284 | fwierzbicki | 2008-09-03 02:25:53 +0200 (Wed, 03 Sep 2008) | 3 lines

from:
http://svn.python.org/projects/python/branches/release25-maint/Lib/test/test_code.py@51333
................
r5285 | fwierzbicki | 2008-09-03 03:00:56 +0200 (Wed, 03 Sep 2008) | 6 lines

Removed co_names, co_consts since these are implementation details
that may never get implemented, and removed flags since there are implementation
differences that may never line up. Still failing on one test for varnames
because I think it is possible that the order of varnames might be useful (in
order declared) and Jython doesn't quite get that right.
................

Files:
modified: /branches/advanced/src/org/python/antlr/ast/Lambda.java (try)
modified: /branches/advanced/src/org/python/antlr/GrammarActions.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/For.java (try)
modified: /branches/advanced/src/org/python/compiler/Module.java (try)
modified: /branches/advanced/src/shell/jython.bat (try)
modified: /branches/advanced/src/org/python/antlr/ast/UnaryOp.java (try)
modified: /branches/advanced/Lib/grp.py (try)
copied: from /trunk/jython/Lib/test/test_code.py (r5285) to /branches/advanced/Lib/test/test_code.py (try)
modified: /branches/advanced/src/org/python/core/PyString.java (try)
modified: /branches/advanced/src/org/python/core/PyObject.java (try)
deleted: /branches/advanced/grammar/PythonWalker.g
modified: /branches/advanced/src/org/python/core/CompilerFacade.java (try)
modified: /branches/advanced/src/org/python/util/jython.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/AugAssign.java (try)
copied: from /trunk/jython/src/org/python/modules/_collections/PyDefaultDictDerived.java (r5285) to /branches/advanced/src/org/python/modules/_collections/PyDefaultDictDerived.java (try)
modified: /branches/advanced/src/org/python/modules/zipimport/zipimporter.java (try)
modified: /branches/advanced/src/org/python/core/PyBaseException.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Exec.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Assign.java (try)
copied: from /trunk/jython/Lib/filecmp.py (r5285) to /branches/advanced/Lib/filecmp.py (try)
modified: /branches/advanced/src/org/python/antlr/ast/ListComp.java (try)
copied: from /trunk/jython/src/org/python/modules/_collections/PyDeque.java (r5285) to /branches/advanced/src/org/python/modules/_collections/PyDeque.java (try)
modified: /branches/advanced/Lib/test/test_inspect.py (try)
copied: from /trunk/jython/src/org/python/modules/_collections/PyDequeDerived.java (r5285) to /branches/advanced/src/org/python/modules/_collections/PyDequeDerived.java (try)
modified: /branches/advanced/src/org/python/core/PyInstance.java (try)
modified: /branches/advanced/Lib/pwd.py (try)
modified: /branches/advanced/src/org/python/antlr/ast/Assert.java (try)
deleted: /branches/advanced/src/org/python/compiler/SourceFile.java
copied: from /trunk/jython/Lib/EastAsianWidth.txt (r5285) to /branches/advanced/Lib/EastAsianWidth.txt (try)
modified: /branches/advanced/grammar/Python.g (try)
modified: /branches/advanced/src/org/python/antlr/ast/Index.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/While.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Repr.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/IfExp.java (try)
modified: /branches/advanced/src/org/python/antlr/ModuleParser.java (try)
copied: from /trunk/jython/Lib/test/test_unicode_jy.py (r5285) to /branches/advanced/Lib/test/test_unicode_jy.py (try)
modified: /branches/advanced/src/org/python/antlr/ast/Subscript.java (try)
modified: /branches/advanced/Lib/test/test_jy_compile.py (try)
copied: from /trunk/jython/src/org/python/modules/_collections/PyDefaultDict.java (r5285) to /branches/advanced/src/org/python/modules/_collections/PyDefaultDict.java (try)
modified: /branches/advanced/src/org/python/core/PyUnicode.java (try)
modified: /branches/advanced/src/org/python/core/__builtin__.java (try)
copied: from /trunk/jython/Lib/collections/__init__.py (r5285) to /branches/advanced/Lib/collections/__init__.py (try)
modified: /branches/advanced/Lib/test/regrtest.py (try)
modified: /branches/advanced/Lib/pkgutil.py (try)
modified: /branches/advanced/Lib/test/test_descr_jy.py (try)
modified: /branches/advanced/src/org/python/compiler/ScopesCompiler.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Print.java (try)
modified: /branches/advanced/tests/java/org/python/antlr/PythonTreeTester.java (try)
modified: /branches/advanced/CoreExposed.includes (try)
modified: /branches/advanced/src/org/python/antlr/ast/Raise.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Attribute.java (try)
modified: /branches/advanced/src/org/python/core/imp.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Yield.java (try)
modified: /branches/advanced/src/org/python/core/Py.java (try)
modified: /branches/advanced (try)
modified: /branches/advanced/ast/asdl_antlr.py (try)
modified: /branches/advanced/src/org/python/antlr/ast/comprehensionType.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Call.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Expr.java (try)
copied: from /trunk/jython/Lib/UnicodeData.txt (r5285) to /branches/advanced/Lib/UnicodeData.txt (try)
modified: /branches/advanced/src/org/python/core/PyFrame.java (try)
modified: /branches/advanced/src/org/python/antlr/ExpressionParser.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Compare.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/keywordType.java (try)
copied: from /trunk/jython/Lib/unicodedata.py (r5285) to /branches/advanced/Lib/unicodedata.py (try)
modified: /branches/advanced/src/org/python/antlr/ast/excepthandlerType.java (try)
modified: /branches/advanced/CPythonLib.includes (try)
copied: from /trunk/jython/src/org/python/modules/_collections/Collections.java (r5285) to /branches/advanced/src/org/python/modules/_collections/Collections.java (try)
modified: /branches/advanced/Lib/test/test_re_jy.py (try)
modified: /branches/advanced/src/org/python/antlr/ast/If.java (try)
copied: from /trunk/jython/src/org/python/modules/_collections (r5285) to /branches/advanced/src/org/python/modules/_collections (try)
copied: from /trunk/jython/Lib/collections (r5285) to /branches/advanced/Lib/collections (try)
modified: /branches/advanced/src/org/python/modules/sre/PatternObject.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Slice.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Expression.java (try)
deleted: /branches/advanced/src/org/python/modules/collections
modified: /branches/advanced/src/org/python/core/io/FileIO.java (try)
modified: /branches/advanced/src/org/python/modules/Setup.java (try)
modified: /branches/advanced/src/org/python/modules/cStringIO.java (try)
modified: /branches/advanced/src/org/python/antlr/InteractiveParser.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/GeneratorExp.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/BinOp.java (try)
modified: /branches/advanced/build.xml (try)
modified: /branches/advanced/src/org/python/antlr/ast/With.java (try)
modified: /branches/advanced/src/org/python/antlr/PythonTokenSource.java (try)
modified: /branches/advanced/src/org/python/antlr/ast/Return.java (try)