jython-checkins

[Jython-checkins] SF.net SVN: jython:[5042] branches/asm/src/org/python/core/__builtin__.java

[<nr...@us...>]

Revision: 5042
          http://jython.svn.sourceforge.net/jython/?rev=5042&view=rev
Author:   nriley
Date:     2008-08-01 20:07:47 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Support one-argument builtin apply.

Modified Paths:
--------------
    branches/asm/src/org/python/core/__builtin__.java

Modified: branches/asm/src/org/python/core/__builtin__.java
===================================================================
--- branches/asm/src/org/python/core/__builtin__.java	2008-08-01 20:06:44 UTC (rev 5041)
+++ branches/asm/src/org/python/core/__builtin__.java	2008-08-01 20:07:47 UTC (rev 5042)
@@ -60,6 +60,8 @@
                 return Py.newUnicode(__builtin__.unichr(Py.py2int(arg1, "unichr(): 1st arg can't be coerced to int")));
             case 7:
                 return __builtin__.abs(arg1);
+            case 9:
+                return __builtin__.apply(arg1);
             case 11:
                 return Py.newInteger(__builtin__.id(arg1));
             case 12:
@@ -335,7 +337,7 @@
         dict.__setitem__("__debug__", Py.One);
 
         dict.__setitem__("abs", new BuiltinFunctions("abs", 7, 1));
-        dict.__setitem__("apply", new BuiltinFunctions("apply", 9, 2, 3));
+        dict.__setitem__("apply", new BuiltinFunctions("apply", 9, 1, 3));
         dict.__setitem__("callable", new BuiltinFunctions("callable", 14, 1));
         dict.__setitem__("coerce", new BuiltinFunctions("coerce", 13, 2));
         dict.__setitem__("chr", new BuiltinFunctions("chr", 0, 1));
@@ -391,6 +393,10 @@
         throw Py.TypeError("bad operand type for abs()");
     }
 
+    public static PyObject apply(PyObject o) {
+	return o.__call__();
+    }
+    
     public static PyObject apply(PyObject o, PyObject args) {
         return o.__call__(Py.make_array(args));
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jython-checkins] SF.net SVN: jython:[5187] branches/asm/src/org/python/core/__builtin__.java

[<zy...@us...>]

Revision: 5187
          http://jython.svn.sourceforge.net/jython/?rev=5187&view=rev
Author:   zyasoft
Date:     2008-08-16 06:22:40 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
input and raw_input now appropriately raise a RuntimeError if
sys.stdin/stdout are deleted (via the facade of
PySystemState.PyAttributeDeleted)

Modified Paths:
--------------
    branches/asm/src/org/python/core/__builtin__.java

Modified: branches/asm/src/org/python/core/__builtin__.java
===================================================================
--- branches/asm/src/org/python/core/__builtin__.java	2008-08-16 06:18:30 UTC (rev 5186)
+++ branches/asm/src/org/python/core/__builtin__.java	2008-08-16 06:22:40 UTC (rev 5187)
@@ -1025,7 +1025,11 @@
     }
     
     public static String raw_input(PyObject prompt, PyObject file) {
-        Py.print(prompt);
+        PyObject stdout = Py.getSystemState().stdout;
+        if (stdout instanceof PyAttributeDeleted) {
+            throw Py.RuntimeError("[raw_]input: lost sys.stdout");
+        }
+        Py.print(stdout, prompt);
         String data = readline(file).toString();
         if (data.endsWith("\n")) {
             return data.substring(0, data.length() - 1);
@@ -1038,7 +1042,11 @@
     }
 
     public static String raw_input(PyObject prompt) {
-        return raw_input(prompt, Py.getSystemState().stdin);
+        PyObject stdin = Py.getSystemState().stdin;
+        if (stdin instanceof PyAttributeDeleted) {
+            throw Py.RuntimeError("[raw_]input: lost sys.stdin");
+        }
+        return raw_input(prompt, stdin);
     }
 
     public static String raw_input() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.