jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: bugtests driver.py,1.4,1.5

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv11343

Modified Files:
	driver.py 
Log Message:
Bumped test count to 340.



Index: driver.py
===================================================================
RCS file: /cvsroot/jython/bugtests/driver.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** driver.py	2001/07/29 18:24:15	1.4
--- driver.py	2001/08/19 14:40:13	1.5
***************
*** 17,21 ****
  warnings = "-w" in opts
  
! for i in range(320):
      m = None
      n = "test%3.3d" % i
--- 17,21 ----
  warnings = "-w" in opts
  
! for i in range(340):
      m = None
      n = "test%3.3d" % i

[Jython-checkins] CVS: jython build.xml,1.15,1.16

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv11166

Modified Files:
	build.xml 
Log Message:
Added conditional compile for the _weakref module.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** build.xml	2001/08/06 18:15:01	1.15
--- build.xml	2001/08/19 14:39:33	1.16
***************
*** 11,14 ****
--- 11,15 ----
          <available classname="java.util.List" property="java2" />
          <available classname="javax.servlet.Servlet" property="servlet" />
+         <available classname="java.lang.ref.WeakReference" property="weakref" />
          <available classname="org.gnu.readline.Readline" property="readline" />
  
***************
*** 78,81 ****
--- 79,87 ----
      </target>
  
+     <target name="check.weakref" unless="weakref">
+         <property name="exclude.weakref.files" 
+             value="**/_weakref.java"/>
+     </target>
+ 
      <target name="check.readline" unless="readline">
          <property name="exclude.readline.files" 
***************
*** 83,87 ****
      </target>
  
!     <target name="checks" depends="check.javaversion,check.servlet,check.readline" />
  
      <target name="compile" depends="prepare,parser,checks">
--- 89,96 ----
      </target>
  
!     <target name="checks" depends="check.javaversion,
!                                    check.servlet,
!                                    check.weakref,
!                                    check.readline" />
  
      <target name="compile" depends="prepare,parser,checks">
***************
*** 93,96 ****
--- 102,106 ----
                        ${exclude.java2.files},
                        ${exclude.servlet.files},
+                       ${exclude.weakref.files},
                        ${exclude.readline.files}"
              debug="${debug}"

[Jython-checkins] CVS: jython/org/python/modules time.java,2.16,2.17

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv18599

Modified Files:
	time.java 
Log Message:
[ #450938 ] time module requires JDK 1.4

Use reflection to call tz.getDisplayName() and tz.getDSTSavings() when
running on a java2 platform.  



Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** time.java	2001/08/05 10:01:50	2.16
--- time.java	2001/08/15 16:45:37	2.17
***************
*** 25,28 ****
--- 25,29 ----
  import java.text.DateFormatSymbols;
  import java.text.DateFormat;
+ import java.lang.reflect.*;
  import java.util.*;
  
***************
*** 103,142 ****
          TimeZone tz = TimeZone.getDefault();
  
!         /* XXXAPI 1.2 START
!         try {
!             tzname = new PyTuple(
!                 new PyObject[] {
!                     new PyString(tz.getDisplayName(false, TimeZone.SHORT)),
!                     new PyString(tz.getDisplayName(true, TimeZone.SHORT))
!                 });
!         }
!         catch (NoSuchMethodError e) {}
!         XXXAPI 1.2 END */
  
-         // getDisplayName() is only available in Java 1.2.  This is the
-         // next best thing, but it isn't really correct, or what the Python
-         // time module spec wants, but it does work for Java 1.1
-         if (tzname == null) {
-             tzname = new PyTuple(
-                 new PyObject[] {
-                     new PyString(tz.getID()),
-                     new PyString(tz.getID())
-                 });
-         }
          daylight = tz.useDaylightTime() ? 1 : 0;
- 
          timezone = -tz.getRawOffset() / 1000;
!         if (tz instanceof SimpleTimeZone) {
!             /* XXXAPI 1.2 START
!             try {
!                 SimpleTimeZone stz = (SimpleTimeZone)tz;
!                 altzone = timezone - stz.getDSTSavings() / 1000;
!             }
!             catch (NoSuchMethodError e) {}
!             XXXAPI 1.2 END */
!         }
!         if (altzone == -1)
!                 // best we can do for Java 1.1.  This is wrong though.
!                 altzone = timezone;
      }
  
--- 104,116 ----
          TimeZone tz = TimeZone.getDefault();
  
!         tzname = new PyTuple(
!             new PyObject[] {
!                 new PyString(getDisplayName(tz, false, 0)),
!                 new PyString(getDisplayName(tz, true, 0))
!             });
  
          daylight = tz.useDaylightTime() ? 1 : 0;
          timezone = -tz.getRawOffset() / 1000;
!         altzone = timezone - getDSTSavings(tz) / 1000;
      }
  
***************
*** 237,241 ****
          if (dst == 0 || dst == 1) {
              cal.set(Calendar.DST_OFFSET,
!                     dst * cal.getTimeZone().getDSTSavings());
          }
          return (double)cal.getTime().getTime()/1000.0;
--- 211,215 ----
          if (dst == 0 || dst == 1) {
              cal.set(Calendar.DST_OFFSET,
!                     dst * getDSTSavings(cal.getTimeZone()));
          }
          return (double)cal.getTime().getTime()/1000.0;
***************
*** 572,593 ****
                  if (cal == null)
                      cal = _tupletocal(tup);
!                 {
!                     boolean use_getid = true;
!                     /* XXXAPI 1.2 START
!                     try {
!                         s = s + cal.getTimeZone().getDisplayName(
!                             // in daylight savings time?  true if == 1 -1
!                             // means the information was not available;
!                             // treat this as if not in dst
!                             item(tup, 8) > 0,
!                             TimeZone.SHORT);
!                         use_getid = false;
!                     }
!                     catch (NoSuchMethodError e) {}
!                     XXXAPI 1.2 END */
!                     if (use_getid)
!                         // See note in classDictInit() above
!                         s = s + cal.getTimeZone().getID();
!                 }
                  break;
              case '%':
--- 546,554 ----
                  if (cal == null)
                      cal = _tupletocal(tup);
!                 s = s + getDisplayName(cal.getTimeZone(),
!                         // in daylight savings time?  true if == 1 -1
!                         // means the information was not available;
!                         // treat this as if not in dst
!                         item(tup, 8) > 0, 0);
                  break;
              case '%':
***************
*** 617,619 ****
--- 578,603 ----
      }
  
+     private static String getDisplayName(TimeZone tz, boolean dst, int style) {
+         String version = System.getProperty("java.version");
+         if (version.compareTo("1.2") >= 0) {
+             try {
+                 Method m = tz.getClass().getMethod("getDisplayName",
+                             new Class[] { Boolean.TYPE, Integer.TYPE });
+                 return (String) m.invoke(tz, new Object[] {
+                             new Boolean(dst), new Integer(style) });
+             } catch (Exception exc) { }
+         }
+         return tz.getID();
+     }
+             
+     private static int getDSTSavings(TimeZone tz) {
+         String version = System.getProperty("java.version");
+         if (version.compareTo("1.2") >= 0) {
+             try {
+                 Method m = tz.getClass().getMethod("getDSTSavings", null);
+                 return ((Integer) m.invoke(tz, null)).intValue();
+              } catch (Exception exc) { }
+         }
+         return 0;
+     }
  }

[Jython-checkins] CVS: jython/org/python/core PyString.java,2.47,2.48

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv27425

Modified Files:
	PyString.java 
Log Message:
Allow a 1-length string to be coerced to Character.class in addtion to the
existing Character.TYPE. This is mainly to improve symmetry.



Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -d -r2.47 -r2.48
*** PyString.java	2001/08/05 13:44:07	2.47
--- PyString.java	2001/08/14 20:14:17	2.48
***************
*** 659,663 ****
          if (c == String.class || c == Object.class || c == Serializable.class)
              return string;
!         if (c == Character.TYPE)
              if (string.length() == 1)
                  return new Character(string.charAt(0));
--- 659,663 ----
          if (c == String.class || c == Object.class || c == Serializable.class)
              return string;
!         if (c == Character.TYPE || c == Character.class)
              if (string.length() == 1)
                  return new Character(string.charAt(0));

[Jython-checkins] CVS: jython/org/python/core PyIgnoreMethodTag.java,NONE,2.1 PyJavaClass.java,2.35,2.36

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv19155

Modified Files:
	PyJavaClass.java 
Added Files:
	PyIgnoreMethodTag.java 
Log Message:
Add support for the PyIgnoreMethodTag exception. java methods which have
this exception in their throws clause will not be available from python.



--- NEW FILE: PyIgnoreMethodTag.java ---

package org.python.core;

/**
 * A tagging exception. It is never actually thrown but used
 * only to mark java methods that should not be visible from
 * jython.
 */
public class PyIgnoreMethodTag extends RuntimeException {
}


Index: PyJavaClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -d -r2.35 -r2.36
*** PyJavaClass.java	2001/03/04 17:52:39	2.35
--- PyJavaClass.java	2001/08/14 19:43:14	2.36
***************
*** 386,389 ****
--- 386,399 ----
      }
  
+     private boolean ignoreMethod(Method method) {
+         Class[] exceptions = method.getExceptionTypes();
+         for (int j = 0; j < exceptions.length; j++) {
+             if (exceptions[j] == PyIgnoreMethodTag.class) {
+                 return true;
+             }
+         }
+         return false;
+     }
+ 
      /* Add all methods declared by this class */
      private void setMethods(Class c, Method[] methods) {
***************
*** 393,396 ****
--- 403,408 ----
              if (dc != c)
                  continue;
+             if (ignoreMethod(method))
+                 continue;
              addMethod(method);
          }
***************
*** 501,504 ****
--- 513,518 ----
              Method method = meths[i];
  
+             if (ignoreMethod(method))
+                 continue;
              if (method.getDeclaringClass() != c ||
                  Modifier.isStatic(method.getModifiers()))
***************
*** 637,640 ****
--- 651,664 ----
      }
  
+     private boolean ignoreConstructor(Constructor method) {
+         Class[] exceptions = method.getExceptionTypes();
+         for (int j = 0; j < exceptions.length; j++) {
+             if (exceptions[j] == PyIgnoreMethodTag.class) {
+                 return true;
+             }
+         }
+         return false;
+     }
+ 
      private void setConstructors(Class c) {
          if (Modifier.isInterface(c.getModifiers())) {
***************
*** 642,650 ****
          } else {
              Constructor[] constructors = getAccessibleConstructors(c);
!             if (constructors.length > 0) {
!                 __init__ = new PyReflectedConstructor(constructors[0]);
!                 for (int i=1; i < constructors.length; i++) {
                      __init__.addConstructor(constructors[i]);
                  }
                  __dict__.__setitem__("__init__", __init__);
              }
--- 666,680 ----
          } else {
              Constructor[] constructors = getAccessibleConstructors(c);
!             for (int i = 0; i < constructors.length; i++) {
!                 if (ignoreConstructor(constructors[i])) {
!                     continue;
!                 }
!                 if (__init__ == null) {
!                     __init__ = new PyReflectedConstructor(constructors[i]);
!                 } else {
                      __init__.addConstructor(constructors[i]);
                  }
+             }
+             if (__init__ != null) {
                  __dict__.__setitem__("__init__", __init__);
              }

[Jython-checkins] CVS: jython/org/python/core PyTableCode.java,2.14,2.15

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv16128

Modified Files:
	PyTableCode.java 
Log Message:
Fix bug in test318.



Index: PyTableCode.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyTableCode.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** PyTableCode.java	2001/05/27 18:49:15	2.14
--- PyTableCode.java	2001/08/14 19:33:55	2.15
***************
*** 278,282 ****
                           PyObject globals, PyObject[] defaults, PyObject closure)
      {
!         if (co_argcount != 2 || args || keywords)
              return call(new PyObject[] {arg1, arg2, arg3},
                          Py.NoKeywords, globals, defaults, closure);
--- 278,282 ----
                           PyObject globals, PyObject[] defaults, PyObject closure)
      {
!         if (co_argcount != 3 || args || keywords)
              return call(new PyObject[] {arg1, arg2, arg3},
                          Py.NoKeywords, globals, defaults, closure);

[Jython-checkins] CVS: bugtests test318.py,NONE,1.1

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv15812

Added Files:
	test318.py 
Log Message:
Test for a bug reported by Kevin Butler on jython-dev.



--- NEW FILE: test318.py ---
"""
Test against AIOOB exceptions.
"""

import support

def go2( a, b ):
    pass

try:
   go2( 1, 2, 3 )
except TypeError:
    pass

[Jython-checkins] CVS: jython/installer mklist.py,1.20,1.21

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/installer
In directory usw-pr-cvs1:/tmp/cvs-serv17937

Modified Files:
	mklist.py 
Log Message:
Added unittest.py



Index: mklist.py
===================================================================
RCS file: /cvsroot/jython/jython/installer/mklist.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mklist.py	2001/08/13 18:36:14	1.20
--- mklist.py	2001/08/13 18:37:27	1.21
***************
*** 137,140 ****
--- 137,141 ----
      'traceback.py',
      'tzparse.py',
+     'unittest.py',
      'urllib.py',
      'urlparse.py',

[Jython-checkins] CVS: jython/installer mklist.py,1.19,1.20

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/installer
In directory usw-pr-cvs1:/tmp/cvs-serv17697

Modified Files:
	mklist.py 
Log Message:
Added PyXML files.



Index: mklist.py
===================================================================
RCS file: /cvsroot/jython/jython/installer/mklist.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mklist.py	2001/07/29 18:16:14	1.19
--- mklist.py	2001/08/13 18:36:14	1.20
***************
*** 222,224 ****
--- 222,238 ----
  listfiles(PYTHONDIR, "Lib", *pylibfiles)
  #listfiles(None, "Lib", 'site.py')
+ 
+ comment("XML modules from CPython and PyXML")
+ listfiles(None, "Lib/xml", "*.py")
+ listfiles(None, "Lib/xml/sax", "*.py")
+ listfiles(None, "Lib/xml/sax/drivers", "*.py")
+ listfiles(None, "Lib/xml/sax/drivers2", "*.py")
+ listfiles(None, "Lib/xml/utils", "*.py")
+ listfiles(None, "Lib/xml/dom", "*.py")
+ listfiles(None, "Lib/xml/dom/ext", "*.py")
+ listfiles(None, "Lib/xml/dom/ext/reader", "*.py")
+ listfiles(None, "Lib/xml/dom/html", "*.py")
+ listfiles(None, "Lib/xml/parsers", "*.py")
+ listfiles(None, "Lib/xml/parsers/xmlproc", "*.py")
+ 
  print "#===== end of list generated by mklist.py ====="

[Jython-checkins] CVS: jython/org/python/parser SimpleNode.java,2.14,2.15

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv15878/parser

Modified Files:
	SimpleNode.java 
Log Message:
Reverting the fix that helped test_grammer. We'll fix test_grammer 
instead.

http://www.geocrawler.com/lists/3/SourceForge/7018/0/6373797/



Index: SimpleNode.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/SimpleNode.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** SimpleNode.java	2001/08/05 14:42:46	2.14
--- SimpleNode.java	2001/08/13 18:30:35	2.15
***************
*** 71,83 ****
      }
  
-     public int getChildIndex(SimpleNode child) {
-         for (int i = 0; i < getNumChildren(); i++) {
-             if (getChild(i) == child) {
-                 return i;
-             }
-         }
-         return -1;
-     }
- 
      public Object getInfo() { return info; }
  
--- 71,74 ----

[Jython-checkins] CVS: jython/org/python/compiler ArgListCompiler.java,2.4,2.5

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv15878/compiler

Modified Files:
	ArgListCompiler.java 
Log Message:
Reverting the fix that helped test_grammer. We'll fix test_grammer 
instead.

http://www.geocrawler.com/lists/3/SourceForge/7018/0/6373797/



Index: ArgListCompiler.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/compiler/ArgListCompiler.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** ArgListCompiler.java	2001/08/05 14:42:45	2.4
--- ArgListCompiler.java	2001/08/13 18:30:35	2.5
***************
*** 66,77 ****
                                           name, node);
          }
          
          //Handle tuple arguments properly
          if (node.getChild(0).id == PythonGrammarTreeConstants.JJTFPLIST) {
-             int idx = ((SimpleNode) node.jjtGetParent()).getChildIndex(node);
-             if (idx >= 0) {
-                 name = "." + (idx * 2);
-             }
- 
              SimpleNode expr = new SimpleNode(
                  PythonGrammarTreeConstants.JJTEXPR_STMT);
--- 66,73 ----
                                           name, node);
          }
+         names.addElement(name);
          
          //Handle tuple arguments properly
          if (node.getChild(0).id == PythonGrammarTreeConstants.JJTFPLIST) {
              SimpleNode expr = new SimpleNode(
                  PythonGrammarTreeConstants.JJTEXPR_STMT);
***************
*** 84,88 ****
              init_code.jjtAddChild(expr, init_code.getNumChildren());
          }
-         names.addElement(name);
  
          // Handle default args if specified
--- 80,83 ----

[Jython-checkins] CVS: jython/org/python/compiler CodeCompiler.java,2.16,2.17

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/compiler
In directory usw-pr-cvs1:/tmp/cvs-serv14579

Modified Files:
	CodeCompiler.java 
Log Message:
continue_stmt(): Changed exception text to match CPython. Pure to
allow test_exception to complete.



Index: CodeCompiler.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/compiler/CodeCompiler.java,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** CodeCompiler.java	2001/07/29 14:59:13	2.16
--- CodeCompiler.java	2001/08/13 18:25:00	2.17
***************
*** 571,575 ****
          //setline(node); Not needed here...
          if (continueLabels.empty()) {
!             throw new ParseException("'continue' outside loop", node);
          }
          
--- 571,575 ----
          //setline(node); Not needed here...
          if (continueLabels.empty()) {
!             throw new ParseException("'continue' not properly in loop", node);
          }
          

[Jython-checkins] CVS: jython/org/python/core PyInstance.java,2.22,2.23

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv24555

Modified Files:
	PyInstance.java 
Log Message:
__getitem__(PyObject): Fix #449316.



Index: PyInstance.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyInstance.java,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** PyInstance.java	2001/07/18 15:53:56	2.22
--- PyInstance.java	2001/08/11 10:39:32	2.23
***************
*** 547,551 ****
          CollectionProxy proxy = getCollection();
          if (proxy != CollectionProxy.NoProxy) {
!             return proxy.__finditem__(key);
          }
  
--- 547,555 ----
          CollectionProxy proxy = getCollection();
          if (proxy != CollectionProxy.NoProxy) {
!             PyObject ret = proxy.__finditem__(key);
!             if (ret == null) {
!                 throw Py.KeyError(key.toString());
!             }
!             return ret;
          }
  

[Jython-checkins] CVS: bugtests test317.py,NONE,1.1 test317c.py,NONE,1.1

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv23587

Added Files:
	test317.py test317c.py 
Log Message:
[ #448485 ] Tuple unpacking raises KeyError 



--- NEW FILE: test317.py ---
"""
[ #448485 ] Tuple unpacking raises KeyError 
"""

import support
support.compileJPythonc("test317c.py", output="test317.err",
                        jar="test317.jar", core=1)
support.runJava("test317c", cp="test317.jar")




--- NEW FILE: test317c.py ---

import string
try:
    (a, b, c) = string.split("elem1 elem2") 
except ValueError:
    pass

[Jython-checkins] CVS: bugtests test316.py,NONE,1.1

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv22800

Added Files:
	test316.py 
Log Message:
[ #449316 ] ArrayList()[0] should raise IndexError



--- NEW FILE: test316.py ---
"""
[ #449316 ] ArrayList()[0] should raise IndexError
"""

import support

from java.util import ArrayList 
al = ArrayList() 
try:
    foo = al[0] 
except KeyError:
    pass
else:
    raise support.TestError("Should raise a KeyError")

[Jython-checkins] CVS: bugtests test313c.py,1.1,1.2

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv21321

Modified Files:
	test313c.py 
Log Message:
Made it clearer that the method shouldn't be called.



Index: test313c.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test313c.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test313c.py	2001/08/06 17:53:54	1.1
--- test313c.py	2001/08/11 10:21:45	1.2
***************
*** 6,10 ****
  from xml.sax.handler import feature_namespaces
  
! def jythonc():
      import xml.sax.drivers2.drv_xmlproc
      import encodings.utf_16_be
--- 6,10 ----
  from xml.sax.handler import feature_namespaces
  
! def dummy_jythonc():
      import xml.sax.drivers2.drv_xmlproc
      import encodings.utf_16_be

[Jython-checkins] CVS: jython/org/python/modules cPickle.java,1.17,1.18

[Samuele P. <ped...@us...>]

Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv25907

Modified Files:
	cPickle.java 
Log Message:
oops... fixed degraded indent


Index: cPickle.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cPickle.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** cPickle.java	2001/08/08 18:15:38	1.17
--- cPickle.java	2001/08/08 18:39:14	1.18
***************
*** 919,923 ****
              }
  
!                 if (tup instanceof PyString) {
                  save_global(object, tup);
                  return;
--- 919,923 ----
              }
  
!             if (tup instanceof PyString) {
                  save_global(object, tup);
                  return;

[Jython-checkins] CVS: jython/org/python/modules cPickle.java,1.16,1.17

[Samuele P. <ped...@us...>]

Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv20101/modules

Modified Files:
	cPickle.java 
Log Message:
Added notes about current situation vs. CPython (relevant for 2.2 stuff)
__builtin__.type changed to work with PyMetaClass hook.


Index: cPickle.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cPickle.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** cPickle.java	2001/02/22 13:04:10	1.16
--- cPickle.java	2001/08/08 18:15:38	1.17
***************
*** 7,10 ****
--- 7,14 ----
   */
  
+ /* note about impl:
+   instanceof vs. CPython type(.) is .
+ */
+ 
  package org.python.modules;
  
***************
*** 915,919 ****
              }
  
!             if (tup instanceof PyString) {
                  save_global(object, tup);
                  return;
--- 919,923 ----
              }
  
!                 if (tup instanceof PyString) {
                  save_global(object, tup);
                  return;

[Jython-checkins] CVS: jython/org/python/core __builtin__.java,2.35,2.36

[Samuele P. <ped...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv20101/core

Modified Files:
	__builtin__.java 
Log Message:
Added notes about current situation vs. CPython (relevant for 2.2 stuff)
__builtin__.type changed to work with PyMetaClass hook.


Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -d -r2.35 -r2.36
*** __builtin__.java	2001/07/18 15:53:56	2.35
--- __builtin__.java	2001/08/08 18:15:38	2.36
***************
*** 862,866 ****
      public static PyClass type(PyObject o) {
          if (o instanceof PyInstance) {
!             return PyJavaClass.lookup(PyInstance.class);
          } else {
              return o.__class__;
--- 862,866 ----
      public static PyClass type(PyObject o) {
          if (o instanceof PyInstance) {
!             return PyJavaClass.lookup(o.getClass()); // was just PyInstance.class, goes with experimental PyMetaClass hook
          } else {
              return o.__class__;

[Jython-checkins] CVS: bugtests test315.py,NONE,1.1 test315c.py,NONE,1.1

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv11997

Added Files:
	test315.py test315c.py 
Log Message:
Test for [ #448523 ] Support "ASCII" as builtin codec.



--- NEW FILE: test315.py ---
"""
Basic test, just raises an TestError
"""

import support
support.compileJPythonc("test315c.py", output="test315.err",
                        jar="test315.jar", core=1)
support.runJava("test315c", cp="test315.jar")




--- NEW FILE: test315c.py ---

"abc".encode("ASCII")

[Jython-checkins] CVS: jython/org/python/core codecs.java,2.10,2.11

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv11119

Modified Files:
	codecs.java 
Log Message:
encode()/decode(): Fix [ #448523 ] Support "ASCII" as builtin codec.



Index: codecs.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/codecs.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** codecs.java	2001/08/05 13:42:28	2.10
--- codecs.java	2001/08/06 20:04:12	2.11
***************
*** 94,97 ****
--- 94,99 ----
          if (encoding == null)
              encoding = getDefaultEncoding();
+         else
+             encoding = normalizestring(encoding);
          if (errors != null)
              errors = errors.intern();
***************
*** 138,141 ****
--- 140,145 ----
          if (encoding == null)
              encoding = getDefaultEncoding();
+         else
+             encoding = normalizestring(encoding);
          if (errors != null)
              errors = errors.intern();

[Jython-checkins] CVS: bugtests test314.py,NONE,1.1

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv8354

Added Files:
	test314.py 
Log Message:
[ #448485 ] Tuple unpacking raises KeyError 



--- NEW FILE: test314.py ---
"""
Basic test, just raises an TestError
"""

import support

import string
s = "elem1 elem2"
try:
   (a, b, c) = string.split(s)
except ValueError:
   pass
else:
   print support.TestError("Should raise a ValueError")

support.compileJPythonc("test314c.py", output="test314.err",
                        jar="test314.jar", core=1)
support.runJava("test314c", cp="test314.jar")

[Jython-checkins] CVS: jython/Doc compile.ht,2.4,2.5

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv30916

Modified Files:
	compile.ht 
Log Message:
Updated the ant.properties example. Added description of installing
PyXML sources.



Index: compile.ht
===================================================================
RCS file: /cvsroot/jython/jython/Doc/compile.ht,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** compile.ht	2001/07/16 13:20:21	2.4
--- compile.ht	2001/08/06 18:26:49	2.5
***************
*** 21,30 ****
  and local options. My <code>ant.properties</code> file look like this:
  <blockquote><pre>
! javaccHome = i:\\java\\Javacc2.0\\bin\\lib
  #build.compiler = classic
  build.compiler = jikes
  debug=on
- </pre></blockquote>
  
  <p>
  
--- 21,47 ----
  and local options. My <code>ant.properties</code> file look like this:
  <blockquote><pre>
! # javaccHome2 is needed when making modification to the grammar.
! javaccHome2 = d:\\java\\Javacc2.0\\bin\\lib
! 
! # PyXmlHome is needed when running the installXML ant task to
! # copy PyXML files to jython.
! PyXmlHome = d:\\python\\PyXML-0.6.6
! 
  #build.compiler = classic
  build.compiler = jikes
  debug=on
  
+ # python.home is needed when building the documentation and installing
+ # PyXML sources.
+ python.home=d:\\python\\python211
+ 
+ # Needed when building documentation.
+ ht2html.dir=d:\\jython\\ht2html-1.1
+ jython.home=d:\\jython\\CVS
+ 
+ # Needed when installing documentation.
+ scp.command=scp
+ scp.user=bckfnn
+ </pre></blockquote>
  <p>
  
***************
*** 65,70 ****
  <blockquote><pre>
  python.path=d:\\python\\Python-2.1\\Lib
! </pre><blockquote>
  
  </ul>
  
--- 82,92 ----
  <blockquote><pre>
  python.path=d:\\python\\Python-2.1\\Lib
! </pre></blockquote>
  
+ <li>The PyXML sources (the content of ./Lib/xml) is not included in the
+ CVS repository. This is mainly because PyXML is developed and released in its 
+ own time cycle. To install PyXML support in a CVS version, the ant properties
+ <code>PyXmlHome</code> and <code>python.home</code> must be configured and
+ the ant task <code>installXML</code> must be executed.
  </ul>
  

[Jython-checkins] CVS: jython build.xml,1.14,1.15

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv24416

Modified Files:
	build.xml 
Log Message:
Fixed comment to match the actual property name.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** build.xml	2001/08/05 16:53:39	1.14
--- build.xml	2001/08/06 18:15:01	1.15
***************
*** 14,18 ****
  
          <!-- This propery should be specified in the ant.property file
!            property name="javaccHome" value="/opt/javacc2.0/bin/lib" /-->
  
          <!-- Give users a change to override editing this file-->
--- 14,18 ----
  
          <!-- This propery should be specified in the ant.property file
!            property name="javaccHome2" value="/opt/javacc2.0/bin/lib" /-->
  
          <!-- Give users a change to override editing this file-->

[Jython-checkins] CVS: bugtests test312.py,NONE,1.1 test313.py,NONE,1.1 test313c.py,NONE,1.1

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv11174

Added Files:
	test312.py test313.py test313c.py 
Log Message:
Very simple tests of xml.sax



--- NEW FILE: test312.py ---
"""
Simple test of xml.
"""

import support
import sys, StringIO

from xml.sax import saxutils
from xml.sax import make_parser
from xml.sax.handler import feature_namespaces

#print sys.modules

file = StringIO.StringIO("""<collection>
  <comic title="Sandman" number='62'>
    <writer>Neil Gaiman</writer>
    <penciller pages='1-9,18-24'>Glyn Dillon</penciller>
    <penciller pages="10-17">Charles Vess</penciller>
  </comic>
  <comic title="Shade, the Changing Man" number="7">
    <writer>Peter Milligan</writer>
    <penciller>Chris Bachalo</penciller>
  </comic>
</collection>""")

class FindIssue(saxutils.DefaultHandler):
    def __init__(self, title, number):
        self.search_title, self.search_number = title, number

    def startElement(self,name,attrs):
        global match
        if name != 'comic' : return

        title = attrs.get('title', None)
        number = attrs.get('number',None)
        if title == self.search_title and number == self.search_number:
            match += 1

parser = make_parser()
#parser.setFeature(feature_namespaces,0)
dh = FindIssue('Sandman', '62')
parser.setContentHandler(dh)

match = 0
parser.parse(file)
assert match == 1


--- NEW FILE: test313.py ---
"""
Jythonc test of xml
"""

import support

support.compileJPythonc("test313c.py", output="test313.err",
                        jar="test313.jar", core=1)
support.runJava("test313c", cp="test313.jar")


--- NEW FILE: test313c.py ---

import sys, StringIO

from xml.sax import saxutils
from xml.sax import make_parser
from xml.sax.handler import feature_namespaces

def jythonc():
    import xml.sax.drivers2.drv_xmlproc
    import encodings.utf_16_be
    import dumbdbm

file = StringIO.StringIO("""<collection>
  <comic title="Sandman" number='62'>
    <writer>Neil Gaiman</writer>
    <penciller pages='1-9,18-24'>Glyn Dillon</penciller>
    <penciller pages="10-17">Charles Vess</penciller>
  </comic>
  <comic title="Shade, the Changing Man" number="7">
    <writer>Peter Milligan</writer>
    <penciller>Chris Bachalo</penciller>
  </comic>
</collection>""")

class FindIssue(saxutils.DefaultHandler):
    def __init__(self, title, number):
        self.search_title, self.search_number = title, number

    def startElement(self,name,attrs):
        global match
        if name != 'comic' : return

        title = attrs.get('title', None)
        number = attrs.get('number',None)
        if title == self.search_title and number == self.search_number:
            match += 1

parser = make_parser()
#parser.setFeature(feature_namespaces,0)
dh = FindIssue('Sandman', '62')
parser.setContentHandler(dh)

match = 0
parser.parse(file)
assert match == 1