[Jython-checkins] SF.net SVN: jython:[6312] trunk/jython

[<pj...@us...>]

Revision: 6312
          http://jython.svn.sourceforge.net/jython/?rev=6312&view=rev
Author:   pjenvey
Date:     2009-05-07 03:48:35 +0000 (Thu, 07 May 2009)

Log Message:
-----------
remove unnecessary casts

Modified Paths:
--------------
    trunk/jython/src/org/python/core/Py.java
    trunk/jython/src/org/python/core/__builtin__.java
    trunk/jython/src/org/python/util/PythonInterpreter.java
    trunk/jython/src/org/python/util/jython.java
    trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2009-05-07 01:41:35 UTC (rev 6311)
+++ trunk/jython/src/org/python/core/Py.java	2009-05-07 03:48:35 UTC (rev 6312)
@@ -1230,8 +1230,8 @@
                 throw Py.TypeError(
                         "exec: argument 1 must be string, code or file object");
             }
-            code = (PyCode)Py.compile_flags(contents, "<string>", CompileMode.exec,
-                                            getCompilerFlags(flags, false));
+            code = Py.compile_flags(contents, "<string>", CompileMode.exec,
+                                    getCompilerFlags(flags, false));
         }
         Py.runCode(code, locals, globals);
     }

Modified: trunk/jython/src/org/python/core/__builtin__.java
===================================================================
--- trunk/jython/src/org/python/core/__builtin__.java	2009-05-07 01:41:35 UTC (rev 6311)
+++ trunk/jython/src/org/python/core/__builtin__.java	2009-05-07 03:48:35 UTC (rev 6312)
@@ -527,7 +527,7 @@
         PyCode code;
 
         try {
-            code = (PyCode)Py.compile_flags(file, name, CompileMode.exec, cflags);
+            code = Py.compile_flags(file, name, CompileMode.exec, cflags);
         } finally {
             try {
                 file.close();

Modified: trunk/jython/src/org/python/util/PythonInterpreter.java
===================================================================
--- trunk/jython/src/org/python/util/PythonInterpreter.java	2009-05-07 01:41:35 UTC (rev 6311)
+++ trunk/jython/src/org/python/util/PythonInterpreter.java	2009-05-07 03:48:35 UTC (rev 6312)
@@ -5,7 +5,6 @@
 import org.python.core.CompileMode;
 import org.python.core.CompilerFlags;
 import org.python.core.Py;
-import org.python.core.PyCode;
 import org.python.core.PyException;
 import org.python.core.PyFile;
 import org.python.core.PyFileWriter;
@@ -164,7 +163,7 @@
 
     public void execfile(java.io.InputStream s, String name) {
         setState();
-        Py.runCode((PyCode)Py.compile_flags(s, name, CompileMode.exec, cflags), locals, locals);
+        Py.runCode(Py.compile_flags(s, name, CompileMode.exec, cflags), locals, locals);
         Py.flushLine();
     }
 

Modified: trunk/jython/src/org/python/util/jython.java
===================================================================
--- trunk/jython/src/org/python/util/jython.java	2009-05-07 01:41:35 UTC (rev 6311)
+++ trunk/jython/src/org/python/util/jython.java	2009-05-07 03:48:35 UTC (rev 6312)
@@ -101,7 +101,7 @@
             InputStream file = zip.getInputStream(runit);
             PyCode code;
             try {
-                code = (PyCode)Py.compile(file, "__run__", CompileMode.exec);
+                code = Py.compile(file, "__run__", CompileMode.exec);
             } finally {
                 file.close();
             }

Modified: trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java
===================================================================
--- trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java	2009-05-07 01:41:35 UTC (rev 6311)
+++ trunk/jython/tests/java/org/python/antlr/PythonTreeTester.java	2009-05-07 03:48:35 UTC (rev 6312)
@@ -41,13 +41,13 @@
         PythonTree r = null;
         switch (_block) {
         case MODULE :
-            r = (PythonTree)parser.file_input().tree;
+            r = parser.file_input().tree;
             break;
         case INTERACTIVE :
-            r = (PythonTree)parser.single_input().tree;
+            r = parser.single_input().tree;
             break;
         case EXPRESSION :
-            r = (PythonTree)parser.eval_input().tree;
+            r = parser.eval_input().tree;
                 break;
         }
         if (args.length > 1) {


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