Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5858] trunk/jython
|
From: <fwi...@us...> - 2009-01-06 20:57:44
|
Revision: 5858
http://jython.svn.sourceforge.net/jython/?rev=5858&view=rev
Author: fwierzbicki
Date: 2009-01-06 20:57:41 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Making the package names point to the raw original package names in source and
making the jarjar step process everything in one step so the package mangling
happens on our source as well as the included jars for jython-complete.jar.
Modified Paths:
--------------
trunk/jython/Lib/os.py
trunk/jython/build.xml
trunk/jython/src/org/python/compiler/AdapterMaker.java
trunk/jython/src/org/python/compiler/ClassFile.java
trunk/jython/src/org/python/compiler/Code.java
trunk/jython/src/org/python/compiler/CodeCompiler.java
trunk/jython/src/org/python/compiler/Constant.java
trunk/jython/src/org/python/compiler/Module.java
trunk/jython/src/org/python/compiler/ProxyMaker.java
trunk/jython/src/org/python/core/APIReader.java
trunk/jython/src/org/python/core/BytecodeLoader.java
trunk/jython/src/org/python/core/Py.java
trunk/jython/src/org/python/core/io/FileIO.java
trunk/jython/src/org/python/core/io/IOBase.java
trunk/jython/src/org/python/core/io/ServerSocketIO.java
trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java
trunk/jython/src/org/python/expose/generate/DescriptorExposer.java
trunk/jython/src/org/python/expose/generate/ExposeTask.java
trunk/jython/src/org/python/expose/generate/ExposedFieldFinder.java
trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java
trunk/jython/src/org/python/expose/generate/ExposedTypeProcessor.java
trunk/jython/src/org/python/expose/generate/ExposedTypeVisitor.java
trunk/jython/src/org/python/expose/generate/Exposer.java
trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java
trunk/jython/src/org/python/expose/generate/MethodExposer.java
trunk/jython/src/org/python/expose/generate/NewExposer.java
trunk/jython/src/org/python/expose/generate/OverridableNewExposer.java
trunk/jython/src/org/python/expose/generate/PyTypes.java
trunk/jython/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java
trunk/jython/src/org/python/expose/generate/TypeExposer.java
trunk/jython/src/org/python/modules/_py_compile.java
trunk/jython/src/org/python/modules/errno.java
trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java
trunk/jython/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
trunk/jython/tests/java/org/python/expose/generate/ExposedTypeVisitorTest.java
trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
trunk/jython/tests/java/org/python/expose/generate/NewExposerTest.java
trunk/jython/tests/java/org/python/expose/generate/OverridableNewExposerTest.java
trunk/jython/tests/java/org/python/expose/generate/TypeExposerTest.java
Modified: trunk/jython/Lib/os.py
===================================================================
--- trunk/jython/Lib/os.py 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/Lib/os.py 2009-01-06 20:57:41 UTC (rev 5858)
@@ -47,10 +47,14 @@
import stat as _stat
import sys
from java.io import File
-from org.python.constantine.platform import Errno
from org.python.core.io import FileDescriptors, FileIO, IOBase
from org.python.core.Py import newString as asPyString
+try:
+ from org.python.constantine.platform import Errno
+except ImportError:
+ from com.kenai.constantine.platform import Errno
+
# Mapping of: os._name: [name list, shell command list]
_os_map = dict(nt=[
['Windows 95', 'Windows 98', 'Windows ME', 'Windows NT',
@@ -96,7 +100,10 @@
# should *NOT* use it
_name = get_os_type()
-from org.python.posix import JavaPOSIX, POSIXHandler, POSIXFactory
+try:
+ from org.python.posix import JavaPOSIX, POSIXHandler, POSIXFactory
+except ImportError:
+ from org.jruby.ext.posix import JavaPOSIX, POSIXHandler, POSIXFactory
class PythonPOSIXHandler(POSIXHandler):
def error(self, error, msg):
@@ -420,7 +427,10 @@
if constant.name() == constant.description():
# XXX: have constantine handle this fallback
# Fake constant or just lacks a description, fallback to Linux's
- from org.python.constantine.platform.linux import Errno as LinuxErrno
+ try:
+ from org.python.constantine.platform.linux import Errno as LinuxErrno
+ except ImportError:
+ from com.kenai.constantine.platform.linux import Errno as LinuxErrno
constant = getattr(LinuxErrno, constant.name(), None)
if not constant:
return 'Unknown error: %d' % code
@@ -558,7 +568,10 @@
global _time_t
if _time_t is None:
from java.lang import Integer, Long
- from org.python.posix.util import Platform
+ try:
+ from org.python.posix import Platform
+ except ImportError:
+ from org.jruby.ext.posix.util import Platform
_time_t = Integer if Platform.IS_32_BIT else Long
try:
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/build.xml 2009-01-06 20:57:41 UTC (rev 5858)
@@ -108,20 +108,9 @@
<target name="full-build" depends="full-check, install" description="a full build with svn checkout" />
<target name="needed-check" unless="full-build">
- <uptodate property="antlr.notneeded" targetfile="${output.dir}/jarjar.jar">
+ <uptodate property="antlr.notneeded" targetfile="${dest.dir}/jython.jar">
<srcfiles dir="grammar" includes="*.g" />
</uptodate>
- <!-- When antlr.notneeded isn't set, a clean is run after this, so jarjar's running depends
- on both that and its own jar -->
- <condition property="jarjar.notneeded">
- <and>
- <isset property="antlr.notneeded"/>
- <uptodate targetfile="${output.dir}/jarjar.jar">
- <srcfiles dir="extlibs" includes="*" />
- <srcfiles dir="grammar" includes="*.g" />
- </uptodate>
- </and>
- </condition>
</target>
<target name="init" depends="version-init">
@@ -166,6 +155,10 @@
<pathelement path="${extlibs.dir}/antlr-2.7.7.jar" />
<pathelement path="${extlibs.dir}/antlr-3.1.1.jar" />
<pathelement path="${extlibs.dir}/stringtemplate-3.2.jar" />
+
+ <pathelement path="${extlibs.dir}/asm-3.1.jar" />
+ <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
+ <pathelement path="${extlibs.dir}/constantine-0.4.jar" />
</path>
<available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
@@ -452,7 +445,7 @@
</target>
- <target name="compile" depends="init,antlr_gen,jarjar,brand-version">
+ <target name="compile" depends="init,antlr_gen,brand-version">
<javac destdir="${compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
@@ -512,10 +505,12 @@
includesfile="${jython.base.dir}/CoreExposed.includes"/>
</target>
- <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded">
+ <target name="jar-complete" depends="jar">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
- <jarjar destfile="${output.dir}/jarjar.jar">
+ <jarjar destfile="${output.dir}/jython-complete.jar">
+ <zipfileset src="${dist.dir}/jython.jar"/>
<zipfileset src="extlibs/antlr-3.1.1-runtime.jar"/>
+ <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
<zipfileset src="extlibs/asm-3.1.jar"/>
<zipfileset src="extlibs/asm-commons-3.1.jar"/>
<zipfileset src="extlibs/asm-util-3.1.jar"/>
@@ -526,6 +521,21 @@
<rule pattern="org.jruby.ext.posix.**" result="org.python.posix.@1"/>
<zipfileset src="extlibs/constantine-0.4.jar"/>
<rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/>
+ <fileset dir="${dist.dir}" includes="Lib/**/*" />
+ <manifest>
+ <attribute name="Main-Class" value="org.python.util.jython" />
+ <attribute name="Built-By" value="${user.name}" />
+ <!-- info section. ATTN: no blanks, no '.' in the names -->
+ <section name="Build-Info">
+ <attribute name="version" value="${jython.version}" />
+ <attribute name="svn-build" value="${do.checkout}" />
+ <attribute name="oracle" value="${oracle.present}" />
+ <attribute name="informix" value="${informix.present}" />
+ <attribute name="build-compiler" value="${build.compiler}" />
+ <attribute name="jdk-target-version" value="${jdk.target.version}" />
+ <attribute name="debug" value="${debug}" />
+ </section>
+ </manifest>
</jarjar>
<unjar src="${output.dir}/jarjar.jar" dest="${jarjar.dir}">
<patternset>
@@ -534,30 +544,7 @@
</unjar>
</target>
- <target name="jar-complete" depends="compile,expose,jarjar">
- <jar destfile="${dist.dir}/jython-complete.jar" duplicate="preserve">
- <fileset dir="${exposed.dir}"/>
- <fileset dir="${compile.dir}"/>
- <fileset dir="${jarjar.dir}">
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="org.python.util.jython" />
- <attribute name="Built-By" value="${user.name}" />
- <!-- info section. ATTN: no blanks, no '.' in the names -->
- <section name="Build-Info">
- <attribute name="version" value="${jython.version}" />
- <attribute name="svn-build" value="${do.checkout}" />
- <attribute name="oracle" value="${oracle.present}" />
- <attribute name="informix" value="${informix.present}" />
- <attribute name="build-compiler" value="${build.compiler}" />
- <attribute name="jdk-target-version" value="${jdk.target.version}" />
- <attribute name="debug" value="${debug}" />
- </section>
- </manifest>
- </jar>
- </target>
-
- <target name="jar" depends="compile,expose,jarjar">
+ <target name="jar" depends="compile,expose">
<typedef name="nameunion" classname="org.python.util.NameUnionAntType">
<classpath>
<path refid="main.classpath" />
@@ -572,9 +559,6 @@
<fileset dir="${exposed.dir}"/>
<fileset dir="${compile.dir}" excludes="org/python/expose/generate/**"/>
</nameunion>
- <fileset dir="${jarjar.dir}">
- <include name="org/python/objectweb/asm/ClassReader.class" />
- </fileset>
<manifest>
<attribute name="Main-Class" value="org.python.util.jython" />
<attribute name="Built-By" value="${user.name}" />
Modified: trunk/jython/src/org/python/compiler/AdapterMaker.java
===================================================================
--- trunk/jython/src/org/python/compiler/AdapterMaker.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/AdapterMaker.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -6,8 +6,8 @@
import java.lang.reflect.Method;
import java.util.HashSet;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.Opcodes;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
import org.python.util.Generic;
Modified: trunk/jython/src/org/python/compiler/ClassFile.java
===================================================================
--- trunk/jython/src/org/python/compiler/ClassFile.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/ClassFile.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -9,11 +9,11 @@
import java.util.Collections;
import java.util.List;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.ClassWriter;
-import org.python.objectweb.asm.FieldVisitor;
-import org.python.objectweb.asm.MethodVisitor;
-import org.python.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
public class ClassFile
{
Modified: trunk/jython/src/org/python/compiler/Code.java
===================================================================
--- trunk/jython/src/org/python/compiler/Code.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/Code.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -3,11 +3,11 @@
import java.util.BitSet;
import java.util.Vector;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.Attribute;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.MethodVisitor;
-import org.python.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
class Code implements MethodVisitor, Opcodes {
MethodVisitor mv;
Modified: trunk/jython/src/org/python/compiler/CodeCompiler.java
===================================================================
--- trunk/jython/src/org/python/compiler/CodeCompiler.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/CodeCompiler.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -79,11 +79,11 @@
import org.python.core.PyObject;
import org.python.core.PyString;
import org.python.core.PyUnicode;
-import org.python.objectweb.asm.ClassWriter;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
-import org.python.objectweb.asm.commons.Method;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.Method;
public class CodeCompiler extends Visitor implements Opcodes, ClassConstants //, PythonGrammarTreeConstants
{
Modified: trunk/jython/src/org/python/compiler/Constant.java
===================================================================
--- trunk/jython/src/org/python/compiler/Constant.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/Constant.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -4,7 +4,7 @@
import java.io.IOException;
-import org.python.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
abstract class Constant implements Opcodes{
public Module module;
Modified: trunk/jython/src/org/python/compiler/Module.java
===================================================================
--- trunk/jython/src/org/python/compiler/Module.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/Module.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -10,8 +10,8 @@
import java.util.List;
import java.util.Map;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.Opcodes;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
import org.python.core.CompilerFlags;
import org.python.core.Py;
import org.python.core.PyException;
Modified: trunk/jython/src/org/python/compiler/ProxyMaker.java
===================================================================
--- trunk/jython/src/org/python/compiler/ProxyMaker.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/compiler/ProxyMaker.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -16,8 +16,8 @@
import org.python.core.PyObject;
import org.python.core.PyProxy;
import org.python.core.PyReflectedFunction;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.Opcodes;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
import org.python.util.Generic;
public class ProxyMaker implements ClassConstants, Opcodes
Modified: trunk/jython/src/org/python/core/APIReader.java
===================================================================
--- trunk/jython/src/org/python/core/APIReader.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/core/APIReader.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -6,9 +6,9 @@
import java.io.IOException;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.ClassReader;
-import org.python.objectweb.asm.commons.EmptyVisitor;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.commons.EmptyVisitor;
/**
* This class reads a classfile from a byte array and pulls out the value of the class annotation
Modified: trunk/jython/src/org/python/core/BytecodeLoader.java
===================================================================
--- trunk/jython/src/org/python/core/BytecodeLoader.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/core/BytecodeLoader.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -4,7 +4,7 @@
import java.security.SecureClassLoader;
import java.util.List;
-import org.python.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassReader;
import org.python.util.Generic;
/**
Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/core/Py.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -20,7 +20,7 @@
import java.util.Set;
import org.python.antlr.base.mod;
-import org.python.constantine.platform.Errno;
+import com.kenai.constantine.platform.Errno;
import org.python.compiler.Module;
import org.python.core.adapter.ClassicPyObjectAdapter;
import org.python.core.adapter.ExtensiblePyObjectAdapter;
Modified: trunk/jython/src/org/python/core/io/FileIO.java
===================================================================
--- trunk/jython/src/org/python/core/io/FileIO.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/core/io/FileIO.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -12,7 +12,7 @@
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
-import org.python.constantine.platform.Errno;
+import com.kenai.constantine.platform.Errno;
import org.python.core.imp;
import org.python.core.Py;
import org.python.core.util.RelativeFile;
Modified: trunk/jython/src/org/python/core/io/IOBase.java
===================================================================
--- trunk/jython/src/org/python/core/io/IOBase.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/core/io/IOBase.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,7 +1,7 @@
/* Copyright (c) 2007 Jython Developers */
package org.python.core.io;
-import org.python.constantine.platform.Errno;
+import com.kenai.constantine.platform.Errno;
import java.io.InputStream;
import java.io.OutputStream;
Modified: trunk/jython/src/org/python/core/io/ServerSocketIO.java
===================================================================
--- trunk/jython/src/org/python/core/io/ServerSocketIO.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/core/io/ServerSocketIO.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -6,7 +6,7 @@
import java.nio.channels.Channel;
import java.nio.channels.ServerSocketChannel;
-import org.python.constantine.platform.Errno;
+import com.kenai.constantine.platform.Errno;
import org.python.core.Py;
/**
Modified: trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/ClassMethodExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,6 +1,6 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.core.PyBuiltinClassMethodNarrow;
public class ClassMethodExposer extends MethodExposer {
Modified: trunk/jython/src/org/python/expose/generate/DescriptorExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/DescriptorExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/DescriptorExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,6 +1,6 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.core.PyDataDescr;
/**
Modified: trunk/jython/src/org/python/expose/generate/ExposeTask.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ExposeTask.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/ExposeTask.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -11,7 +11,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.GlobPatternMapper;
import org.apache.tools.ant.util.SourceFileScanner;
-import org.python.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassWriter;
import org.python.util.Generic;
public class ExposeTask extends MatchingTask {
Modified: trunk/jython/src/org/python/expose/generate/ExposedFieldFinder.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ExposedFieldFinder.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/ExposedFieldFinder.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,8 +1,8 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.Attribute;
-import org.python.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.FieldVisitor;
public abstract class ExposedFieldFinder implements FieldVisitor, PyTypes {
Modified: trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/ExposedMethodFinder.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -3,11 +3,11 @@
import java.util.List;
import org.python.expose.MethodType;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.MethodAdapter;
-import org.python.objectweb.asm.MethodVisitor;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.MethodAdapter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.util.Generic;
/**
Modified: trunk/jython/src/org/python/expose/generate/ExposedTypeProcessor.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ExposedTypeProcessor.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/ExposedTypeProcessor.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -7,16 +7,16 @@
import java.util.Map;
import org.python.expose.ExposedType;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.ClassAdapter;
-import org.python.objectweb.asm.ClassReader;
-import org.python.objectweb.asm.ClassVisitor;
-import org.python.objectweb.asm.ClassWriter;
-import org.python.objectweb.asm.FieldVisitor;
-import org.python.objectweb.asm.MethodAdapter;
-import org.python.objectweb.asm.MethodVisitor;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassAdapter;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodAdapter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.util.Generic;
/**
Modified: trunk/jython/src/org/python/expose/generate/ExposedTypeVisitor.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/ExposedTypeVisitor.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/ExposedTypeVisitor.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,7 +1,7 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Type;
/**
* Visits an ExposedType annotation and passes the values it gathers to handleResult.
Modified: trunk/jython/src/org/python/expose/generate/Exposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/Exposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/Exposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -3,12 +3,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.python.objectweb.asm.ClassVisitor;
-import org.python.objectweb.asm.ClassWriter;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.MethodVisitor;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.core.BytecodeLoader;
/**
Modified: trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,7 +1,7 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Type;
import org.python.core.PyBuiltinMethod;
import org.python.core.PyBuiltinMethodNarrow;
import org.python.expose.ExposedMethod;
Modified: trunk/jython/src/org/python/expose/generate/MethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/MethodExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/MethodExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,6 +1,6 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
public abstract class MethodExposer extends Exposer {
Modified: trunk/jython/src/org/python/expose/generate/NewExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/NewExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/NewExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -2,8 +2,8 @@
import java.lang.reflect.Method;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.core.PyNewWrapper;
import org.python.core.PyObject;
import org.python.core.PyType;
Modified: trunk/jython/src/org/python/expose/generate/OverridableNewExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/OverridableNewExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/OverridableNewExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,8 +1,8 @@
package org.python.expose.generate;
import org.python.core.PyOverridableNew;
-import org.python.objectweb.asm.Label;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Type;
public class OverridableNewExposer extends Exposer {
Modified: trunk/jython/src/org/python/expose/generate/PyTypes.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/PyTypes.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/PyTypes.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,6 +1,6 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.core.Py;
import org.python.core.PyBoolean;
import org.python.core.PyBuiltinCallable;
Modified: trunk/jython/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,6 +1,6 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.AnnotationVisitor;
/**
* An Annotation visitor that throws an IllegalArgumentException if it visits anything other than
Modified: trunk/jython/src/org/python/expose/generate/TypeExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/TypeExposer.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/expose/generate/TypeExposer.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -7,7 +7,7 @@
import org.python.expose.BaseTypeBuilder;
import org.python.expose.ExposedType;
import org.python.expose.TypeBuilder;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.util.Generic;
/**
Modified: trunk/jython/src/org/python/modules/_py_compile.java
===================================================================
--- trunk/jython/src/org/python/modules/_py_compile.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/modules/_py_compile.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -3,7 +3,7 @@
import java.io.File;
-import org.python.constantine.platform.Errno;
+import com.kenai.constantine.platform.Errno;
import org.python.core.Py;
import org.python.core.PyList;
import org.python.core.PyString;
Modified: trunk/jython/src/org/python/modules/errno.java
===================================================================
--- trunk/jython/src/org/python/modules/errno.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/src/org/python/modules/errno.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,8 +1,8 @@
/* Copyright (c) Jython Developers */
package org.python.modules;
-import org.python.constantine.Constant;
-import org.python.constantine.ConstantSet;
+import com.kenai.constantine.Constant;
+import com.kenai.constantine.ConstantSet;
import org.python.core.ClassDictInit;
import org.python.core.Py;
import org.python.core.PyDictionary;
@@ -14,7 +14,7 @@
* The Python errno module.
*
* Errno constants can be accessed from Java code via
- * {@link org.python.constantine.platform.Errno}, e.g. Errno.ENOENT.
+ * {@link com.kenai.constantine.platform.Errno}, e.g. Errno.ENOENT.
*/
public class errno implements ClassDictInit {
Modified: trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,6 +1,6 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.core.BytecodeLoader;
import org.python.core.Py;
import org.python.core.PyDataDescr;
Modified: trunk/jython/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -2,10 +2,10 @@
import junit.framework.TestCase;
-import org.python.objectweb.asm.AnnotationVisitor;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
-import org.python.objectweb.asm.commons.EmptyVisitor;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.commons.EmptyVisitor;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
Modified: trunk/jython/tests/java/org/python/expose/generate/ExposedTypeVisitorTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/ExposedTypeVisitorTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/ExposedTypeVisitorTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.core.PyObject;
import org.python.expose.generate.ExposedTypeVisitor;
Modified: trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,7 +1,7 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.core.BytecodeLoader;
import org.python.core.Py;
import org.python.core.PyBuiltinCallable;
Modified: trunk/jython/tests/java/org/python/expose/generate/NewExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/NewExposerTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/NewExposerTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,7 +1,7 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.core.BytecodeLoader;
import org.python.core.Py;
import org.python.core.PyNewWrapper;
Modified: trunk/jython/tests/java/org/python/expose/generate/OverridableNewExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/OverridableNewExposerTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/OverridableNewExposerTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -1,7 +1,7 @@
package org.python.expose.generate;
-import org.python.objectweb.asm.Opcodes;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.python.core.BytecodeLoader;
import org.python.core.Py;
import org.python.core.PyDictionary;
Modified: trunk/jython/tests/java/org/python/expose/generate/TypeExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/TypeExposerTest.java 2009-01-06 02:11:04 UTC (rev 5857)
+++ trunk/jython/tests/java/org/python/expose/generate/TypeExposerTest.java 2009-01-06 20:57:41 UTC (rev 5858)
@@ -4,7 +4,7 @@
import junit.framework.TestCase;
-import org.python.objectweb.asm.Type;
+import org.objectweb.asm.Type;
import org.python.core.Py;
import org.python.core.PyNewWrapper;
import org.python.core.PyObject;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
