jython-checkins Mailing List for Jython (Page 242)

Brought to you by: bckfnn, bwarsaw, bzimmer, cgroves, and 4 others

jython-checkins — For Jython checkin messages

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (107)	Dec (67)
2001	Jan (76)	Feb (125)	Mar (72)	Apr (13)	May (18)	Jun (12)	Jul (129)	Aug (47)	Sep (1)	Oct (36)	Nov (128)	Dec (124)
2002	Jan (59)	Feb	Mar (14)	Apr (14)	May (72)	Jun (9)	Jul (3)	Aug (5)	Sep (18)	Oct (65)	Nov (28)	Dec (12)
2003	Jan (10)	Feb (2)	Mar (4)	Apr (33)	May (21)	Jun (9)	Jul (29)	Aug (34)	Sep (4)	Oct (8)	Nov (15)	Dec (4)
2004	Jan (26)	Feb (12)	Mar (11)	Apr (9)	May (7)	Jun	Jul (5)	Aug	Sep (3)	Oct (7)	Nov (1)	Dec (10)
2005	Jan (2)	Feb (72)	Mar (16)	Apr (39)	May (48)	Jun (97)	Jul (57)	Aug (13)	Sep (16)	Oct (24)	Nov (100)	Dec (24)
2006	Jan (15)	Feb (34)	Mar (33)	Apr (31)	May (79)	Jun (64)	Jul (41)	Aug (64)	Sep (31)	Oct (46)	Nov (55)	Dec (37)
2007	Jan (32)	Feb (61)	Mar (11)	Apr (58)	May (46)	Jun (30)	Jul (94)	Aug (93)	Sep (86)	Oct (69)	Nov (125)	Dec (177)
2008	Jan (169)	Feb (97)	Mar (74)	Apr (113)	May (120)	Jun (334)	Jul (215)	Aug (237)	Sep (72)	Oct (189)	Nov (126)	Dec (160)
2009	Jan (180)	Feb (45)	Mar (98)	Apr (140)	May (151)	Jun (71)	Jul (107)	Aug (119)	Sep (73)	Oct (121)	Nov (14)	Dec (6)
2010	Jan (13)	Feb (9)	Mar (10)	Apr (64)	May (3)	Jun (16)	Jul (7)	Aug (23)	Sep (17)	Oct (37)	Nov (5)	Dec (8)
2011	Jan (10)	Feb (11)	Mar (77)	Apr (11)	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 240 241 242 243 244 .. 267 > >> (Page 242 of 267)

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

From: Finn B. <bc...@us...> - 2001-08-05 16:53:45

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

Modified Files:
	build.xml 
Log Message:
Removed the SAX-1 driver sax.drivers.drv_xmlproc based on an 
recommendation from Martin v. Loewis



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** build.xml	2001/08/05 12:20:22	1.13
--- build.xml	2001/08/05 16:53:39	1.14
***************
*** 136,141 ****
                  ns.py,
                  sax/*.py,
!                 sax/**/drv_xmlproc.py,
!                 sax/**/__init__.py,
                  utils/*.py,
                  dom/*.py,
--- 136,141 ----
                  ns.py,
                  sax/*.py,
!                 sax/drivers2/drv_xmlproc.py,
!                 sax/drivers2/__init__.py,
                  utils/*.py,
                  dom/*.py,

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

From: Finn B. <bc...@us...> - 2001-08-05 15:14:10

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

Modified Files:
	PyList.java 
Log Message:
Changed the exception message from remove() and index() so it matches
CPython. Only to make test_doctest happy.



Index: PyList.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyList.java,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -d -r2.21 -r2.22
*** PyList.java	2001/03/04 18:08:59	2.21
--- PyList.java	2001/08/05 15:14:07	2.22
***************
*** 353,356 ****
--- 353,360 ----
       */
      public int index(PyObject o) {
+         return _index(o, "list.index(x): x not in list");
+     }
+ 
+     private int _index(PyObject o, String message) {
          int n = length;
          PyObject[] list = this.list;
***************
*** 361,365 ****
          }
          if (i == n)
!             throw Py.ValueError("item not found in list");
          return i;
      }
--- 365,369 ----
          }
          if (i == n)
!             throw Py.ValueError(message);
          return i;
      }
***************
*** 393,397 ****
       */
      public void remove(PyObject o) {
!         del(index(o));
      }
  
--- 397,401 ----
       */
      public void remove(PyObject o) {
!         del(_index(o, "list.remove(x): x not in list"));
      }

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

From: Finn B. <bc...@us...> - 2001-08-05 14:42:50

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

Modified Files:
	ArgListCompiler.java 
Log Message:
Mangle the name of tuple function parameters. it now matches CPython and
allow test_grammar to complete.



Index: ArgListCompiler.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/compiler/ArgListCompiler.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -d -r2.3 -r2.4
*** ArgListCompiler.java	2000/01/17 19:45:04	2.3
--- ArgListCompiler.java	2001/08/05 14:42:45	2.4
***************
*** 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);
--- 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);
***************
*** 80,83 ****
--- 84,88 ----
              init_code.jjtAddChild(expr, init_code.getNumChildren());
          }
+         names.addElement(name);
  
          // Handle default args if specified

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

From: Finn B. <bc...@us...> - 2001-08-05 14:42:49

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

Modified Files:
	SimpleNode.java 
Log Message:
Mangle the name of tuple function parameters. it now matches CPython and
allow test_grammar to complete.



Index: SimpleNode.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/SimpleNode.java,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -d -r2.13 -r2.14
*** SimpleNode.java	2001/03/08 23:43:51	2.13
--- SimpleNode.java	2001/08/05 14:42:46	2.14
***************
*** 71,74 ****
--- 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; }

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

From: Finn B. <bc...@us...> - 2001-08-05 13:44:10

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

Modified Files:
	PyString.java 
Log Message:
[ #447006 ] Fix NPE in PyString constructor



Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -d -r2.46 -r2.47
*** PyString.java	2001/07/27 14:55:46	2.46
--- PyString.java	2001/08/05 13:44:07	2.47
***************
*** 241,244 ****
--- 241,248 ----
  
      public PyString(String string) {
+         if (string == null) {
+             throw new IllegalArgumentException(
+                             "Cannot create PyString from null!");
+         }
          this.string = string;
      }

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

From: Finn B. <bc...@us...> - 2001-08-05 13:42:32

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

Modified Files:
	codecs.java 
Log Message:
Add support for a default error argument to all the codecs methods.



Index: codecs.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/codecs.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** codecs.java	2001/02/25 16:51:51	2.9
--- codecs.java	2001/08/05 13:42:28	2.10
***************
*** 112,116 ****
          /* Decode via the codec registry */
          PyObject decoder = getDecoder(encoding);
!         PyObject result = decoder.__call__(v, new PyString(errors));
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)
--- 112,121 ----
          /* Decode via the codec registry */
          PyObject decoder = getDecoder(encoding);
!         PyObject result = null;
!         if (errors != null) {
!             result = decoder.__call__(v, new PyString(errors));
!         } else {
!             result = decoder.__call__(v);
!         }
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)
***************
*** 151,155 ****
          /* Decode via the codec registry */
          PyObject encoder = getEncoder(encoding);
!         PyObject result = encoder.__call__(v, new PyString(errors));
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)
--- 156,165 ----
          /* Decode via the codec registry */
          PyObject encoder = getEncoder(encoding);
!         PyObject result = null;
!         if (errors != null) {
!             result = encoder.__call__(v, new PyString(errors));
!         } else {
!             result = encoder.__call__(v);
!         }
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)

[Jython-checkins] CVS: jython/org/python/modules _codecs.java,2.8,2.9

From: Finn B. <bc...@us...> - 2001-08-05 13:42:31

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

Modified Files:
	_codecs.java 
Log Message:
Add support for a default error argument to all the codecs methods.



Index: _codecs.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/_codecs.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** _codecs.java	2001/07/14 22:23:03	2.8
--- _codecs.java	2001/08/05 13:42:28	2.9
***************
*** 36,39 ****
--- 36,43 ----
      /* --- UTF-8 Codec --------------------------------------------------- */
  
+     public static PyTuple utf_8_decode(String str) {
+         return utf_8_decode(str, null);
+     }
+ 
      public static PyTuple utf_8_decode(String str, String errors) {
          int size = str.length();
***************
*** 146,149 ****
--- 150,157 ----
      /* --- 7-bit ASCII Codec -------------------------------------------- */
  
+     public static PyTuple ascii_decode(String str) {
+         return ascii_decode(str, null);
+     }
+ 
      public static PyTuple ascii_decode(String str, String errors) {
          int size = str.length();
***************
*** 153,156 ****
--- 161,168 ----
  
  
+     public static PyTuple ascii_encode(String str) {
+         return ascii_encode(str, null);
+     }
+ 
      public static PyTuple ascii_encode(String str, String errors) {
          int size = str.length();
***************
*** 162,165 ****
--- 174,181 ----
      /* --- Latin-1 Codec -------------------------------------------- */
  
+     public static PyTuple latin_1_decode(String str) {
+         return latin_1_decode(str, null);
+     }
+ 
      public static PyTuple latin_1_decode(String str, String errors) {
          int size = str.length();
***************
*** 182,186 ****
  
  
! 
  
      public static PyTuple latin_1_encode(String str, String errors) {
--- 198,204 ----
  
  
!     public static PyTuple latin_1_encode(String str) {
!         return latin_1_encode(str, null);
!     }
  
      public static PyTuple latin_1_encode(String str, String errors) {
***************
*** 203,206 ****
--- 221,228 ----
  
  
+     public static PyTuple utf_16_encode(String str) {
+         return utf_16_encode(str, null);
+     }
+ 
      public static PyTuple utf_16_encode(String str, String errors) {
          return codec_tuple(encode_UTF16(str, errors, 0), str.length());
***************
*** 213,220 ****
--- 235,250 ----
      }
  
+     public static PyTuple utf_16_le_encode(String str) {
+         return utf_16_le_encode(str, null);
+     }
+ 
      public static PyTuple utf_16_le_encode(String str, String errors) {
          return codec_tuple(encode_UTF16(str, errors, -1), str.length());
      }
  
+     public static PyTuple utf_16_be_encode(String str) {
+         return utf_16_be_encode(str, null);
+     }
+ 
      public static PyTuple utf_16_be_encode(String str, String errors) {
          return codec_tuple(encode_UTF16(str, errors, 1), str.length());
***************
*** 253,256 ****
--- 283,290 ----
  
  
+     public static PyTuple utf_16_decode(String str) {
+         return utf_16_decode(str, null);
+     }
+ 
      public static PyTuple utf_16_decode(String str, String errors) {
          int[] bo = new int[] { 0 };
***************
*** 264,267 ****
--- 298,305 ----
      }
  
+     public static PyTuple utf_16_le_decode(String str) {
+         return utf_16_le_decode(str, null);
+     }
+ 
      public static PyTuple utf_16_le_decode(String str, String errors) {
          int[] bo = new int[] { -1 };
***************
*** 269,272 ****
--- 307,314 ----
      }
  
+     public static PyTuple utf_16_be_decode(String str) {
+         return utf_16_be_decode(str, null);
+     }
+ 
      public static PyTuple utf_16_be_decode(String str, String errors) {
          int[] bo = new int[] { 1 };
***************
*** 274,277 ****
--- 316,323 ----
      }
  
+     public static PyTuple utf_16_ex_decode(String str) {
+         return utf_16_ex_decode(str, null);
+     }
+ 
      public static PyTuple utf_16_ex_decode(String str, String errors) {
          return utf_16_ex_decode(str, errors, 0);
***************
*** 358,361 ****
--- 404,411 ----
  
  
+     public static PyTuple raw_unicode_escape_encode(String str) {
+         return raw_unicode_escape_encode(str, null);
+     }
+ 
      public static PyTuple raw_unicode_escape_encode(String str,
                                                     String errors) {
***************
*** 366,369 ****
--- 416,423 ----
  
  
+     public static PyTuple raw_unicode_escape_decode(String str) {
+         return raw_unicode_escape_decode(str, null);
+     }
+ 
      public static PyTuple raw_unicode_escape_decode(String str,
                                                      String errors) {
***************
*** 378,381 ****
--- 432,439 ----
  
  
+     public static PyTuple unicode_escape_encode(String str) {
+         return unicode_escape_encode(str, null);
+     }
+ 
      public static PyTuple unicode_escape_encode(String str, String errors) {
          return codec_tuple(PyString.encode_UnicodeEscape(str, false),
***************
*** 383,386 ****
--- 441,448 ----
      }
  
+     public static PyTuple unicode_escape_decode(String str) {
+         return unicode_escape_decode(str, null);
+     }
+ 
      public static PyTuple unicode_escape_decode(String str, String errors) {
          int n = str.length();
***************
*** 394,399 ****
--- 456,469 ----
  
  
+     public static PyTuple unicode_internal_encode(String str) {
+         return unicode_internal_encode(str, null);
+     }
+ 
      public static PyTuple unicode_internal_encode(String str, String errors) {
          return codec_tuple(str, str.length());
+     }
+ 
+     public static PyTuple unicode_internal_decode(String str) {
+         return unicode_internal_decode(str, null);
      }

[Jython-checkins] CVS: jython build.xml,1.12,1.13

From: Finn B. <bc...@us...> - 2001-08-05 12:20:24

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

Modified Files:
	build.xml 
Log Message:
Support for PyXML. Copying of the PyXML files is a seperate (manual) step
at the moment.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.xml	2001/07/18 10:57:04	1.12
--- build.xml	2001/08/05 12:20:22	1.13
***************
*** 128,131 ****
--- 128,153 ----
      </target>
  
+     <target name="installXML" depends="init">
+         <!-- Set the configuration variables python.home and PyXmlHome
+              in your ant.properties file -->
+         <copy todir="${sourceDir}/Lib/xml">
+             <fileset dir="${python.home}/Lib/xml" includes="__init__.py"/>
+             <fileset dir="${PyXmlHome}/xml" includes="
+                 ns.py,
+                 sax/*.py,
+                 sax/**/drv_xmlproc.py,
+                 sax/**/__init__.py,
+                 utils/*.py,
+                 dom/*.py,
+                 dom/html/*.py,
+                 dom/ext/*.py,
+                 dom/ext/reader/__init__.py,
+                 dom/ext/reader/Sax*.py,
+                 parsers/__init__.py,
+                 parsers/xmlproc/*.py,
+                 "/>
+         </copy>
+     </target>
+ 
      <target name="all" depends="init,clean,prepare,parser,compile,jar">
      </target>

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

From: Finn B. <bc...@us...> - 2001-08-05 10:01:52

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

Modified Files:
	time.java 
Log Message:
mktime(): Use te DST flag. See test311.py



Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** time.java	2001/07/29 17:13:46	2.15
--- time.java	2001/08/05 10:01:50	2.16
***************
*** 234,237 ****
--- 234,242 ----
              throw e;
          }
+         int dst = item(tup, 8);
+         if (dst == 0 || dst == 1) {
+             cal.set(Calendar.DST_OFFSET,
+                     dst * cal.getTimeZone().getDSTSavings());
+         }
          return (double)cal.getTime().getTime()/1000.0;
      }

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

From: Finn B. <bc...@us...> - 2001-08-05 10:00:55

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

Added Files:
	test311.py 
Log Message:
A test for the DST flag in time.mktime()



--- NEW FILE: test311.py ---
"""
Test DST for time.mktime
"""

import support
import time

def check(tup, facit):
   #print tup, long(time.mktime(tup)), facit
   assert time.mktime(tup) == facit

check((1998, 6, 13, 0, 0, 0, 0, 0, 0), 897692400)
check((1998, 6, 13, 0, 0, 0, 0, 0, -1), 897688800)
check((1998, 6, 13, 0, 0, 0, 0, 0, 0), 897692400)
check((1998, 6, 13, 0, 0, 0, 0, 0, 1), 897688800)
check((1998, 1, 13, 0, 0, 0, 0, 0, -1), 884646000)
check((1998, 1, 13, 0, 0, 0, 0, 0, 0), 884646000)
check((1998, 1, 13, 0, 0, 0, 0, 0, 1), 884642400)

[Jython-checkins] CVS: htdocs/applets links.h,1.3,1.4

From: Finn B. <bc...@us...> - 2001-07-29 21:05:06

Update of /cvsroot/jython/htdocs/applets
In directory usw-pr-cvs1:/tmp/cvs-serv9907/applets

Modified Files:
	links.h 
Log Message:
Updated to alpha3.



Index: links.h
===================================================================
RCS file: /cvsroot/jython/htdocs/applets/links.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** links.h	2001/07/19 14:51:07	1.3
--- links.h	2001/07/29 21:05:04	1.4
***************
*** 4,8 ****
  <li><a href="../license.html">License</a>
  <li><a href="../download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=44111">Jython 2.1a2</a>
  <li><a href="../install.html">Installing</a>
  <li><a href="../platform.html">JVM Compatibility</a>
--- 4,8 ----
  <li><a href="../license.html">License</a>
  <li><a href="../download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">Jython 2.1a3</a>
  <li><a href="../install.html">Installing</a>
  <li><a href="../platform.html">JVM Compatibility</a>

[Jython-checkins] CVS: htdocs/docs links.h,1.5,1.6

From: Finn B. <bc...@us...> - 2001-07-29 21:05:06

Update of /cvsroot/jython/htdocs/docs
In directory usw-pr-cvs1:/tmp/cvs-serv9907/docs

Modified Files:
	links.h 
Log Message:
Updated to alpha3.



Index: links.h
===================================================================
RCS file: /cvsroot/jython/htdocs/docs/links.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** links.h	2001/07/19 14:50:57	1.5
--- links.h	2001/07/29 21:05:04	1.6
***************
*** 4,8 ****
  <li><a href="../license.html">License</a>
  <li><a href="../download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=44111">Jython 2.1a2</a>
  <li><a href="../install.html">Installing</a>
  <li><a href="../platform.html">JVM Compatibility</a>
--- 4,8 ----
  <li><a href="../license.html">License</a>
  <li><a href="../download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">Jython 2.1a3</a>
  <li><a href="../install.html">Installing</a>
  <li><a href="../platform.html">JVM Compatibility</a>

[Jython-checkins] CVS: htdocs NEWS.ht,1.10,1.11 index.ht,1.21,1.22 links.h,1.9,1.10

From: Finn B. <bc...@us...> - 2001-07-29 21:05:06

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

Modified Files:
	NEWS.ht index.ht links.h 
Log Message:
Updated to alpha3.



Index: NEWS.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/NEWS.ht,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NEWS.ht	2001/07/19 14:52:11	1.10
--- NEWS.ht	2001/07/29 21:05:04	1.11
***************
*** 2,5 ****
--- 2,19 ----
  Jython NEWS
  
+ 29-jul-2001 Jython 2.1 alpha 3
+ 
+   New features.
+    - A settable console encoding will allow windows users to enter
+      national characters at the command prompt.
+    - Non-public classes are available when respectJavaAccessibility is false
+    - The names of zip- and jarfiles can be added to sys.path.
+ 
+   Bug fixes.
+    - The standard python library files are from CPython-2.1.1
+    - A complete list of fixed bugs can be found on SF:
+         http://sourceforge.net/tracker/?group_id=12867&atid=112867
+      Select Status=Any and Group=Fixed in 2.1a3
+ 
  18-jul-2001 Jython 2.1 alpha 2
  

Index: index.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/index.ht,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** index.ht	2001/07/27 06:51:07	1.21
--- index.ht	2001/07/29 21:05:04	1.22
***************
*** 20,28 ****
  
  <dl>
!     <p><dt><b>Jython 2.1 alpha 2 released!</b>
      <dd>Download the lastest release of Jython 
!         <a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=44111">here</a>, or 
          <a href="NEWS.html">read a summary</a>
! 	of recent changes. (18-jul-2001).
  
      <p><dt><b>Jython 2.1a1 released!</b>
--- 20,31 ----
  
  <dl>
!     <p><dt><b>Jython 2.1 alpha 3 released!</b>
      <dd>Download the lastest release of Jython 
!         <a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">here</a>, or 
          <a href="NEWS.html">read a summary</a>
! 	of recent changes. (29-jul-2001).
! 
!     <p><dt><b>Jython 2.1a2 released!</b>
!     <dd>The second alpha release of Jython 2.1 is available (18-jul-2001)
  
      <p><dt><b>Jython 2.1a1 released!</b>

Index: links.h
===================================================================
RCS file: /cvsroot/jython/htdocs/links.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** links.h	2001/07/18 20:23:07	1.9
--- links.h	2001/07/29 21:05:04	1.10
***************
*** 4,8 ****
  <li><a href="license.html">License</a>
  <li><a href="download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=44111">Jython 2.1a2</a>
  <li><a href="install.html">Installing</a>
  <li><a href="platform.html">JVM Compatibility</a>
--- 4,8 ----
  <li><a href="license.html">License</a>
  <li><a href="download.html">Jython 2.0</a>
! <li><a href="http://sourceforge.net/project/showfiles.php?group_id=12867&release_id=45862">Jython 2.1a3</a>
  <li><a href="install.html">Installing</a>
  <li><a href="platform.html">JVM Compatibility</a>

[Jython-checkins] CVS: jython NEWS,2.35,2.36

From: Finn B. <bc...@us...> - 2001-07-29 20:46:52

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

Modified Files:
	NEWS 
Log Message:
News for alpha 3.



Index: NEWS
===================================================================
RCS file: /cvsroot/jython/jython/NEWS,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -d -r2.35 -r2.36
*** NEWS	2001/07/18 16:44:56	2.35
--- NEWS	2001/07/29 20:46:49	2.36
***************
*** 1,4 ****
--- 1,18 ----
  Jython NEWS
  
+ 29-jul-2001 Jython 2.1 alpha 3
+ 
+   New features.
+    - A settable console encoding will allow windows users to enter
+      national characters at the command prompt.
+    - Non-public classes are available when respectJavaAccessibility is false
+    - The names of zip- and jarfiles can be added to sys.path.
+ 
+   Bug fixes.
+    - The standard python library files are from CPython-2.1.1
+    - A complete list of fixed bugs can be found on SF:
+         http://sourceforge.net/tracker/?group_id=12867&atid=112867
+      Select Status=Any and Group=Fixed in 2.1a3
+ 
  18-jul-2001 Jython 2.1 alpha 2

[Jython-checkins] CVS: jython/Demo/applet HelloWorld.py,1.3,1.4

From: Finn B. <bc...@us...> - 2001-07-29 20:33:46

Update of /cvsroot/jython/jython/Demo/applet
In directory usw-pr-cvs1:/tmp/cvs-serv28591

Modified Files:
	HelloWorld.py 
Log Message:
Show version number in hello world demo.



Index: HelloWorld.py
===================================================================
RCS file: /cvsroot/jython/jython/Demo/applet/HelloWorld.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HelloWorld.py	2000/11/12 22:09:10	1.3
--- HelloWorld.py	2001/07/29 20:33:43	1.4
***************
*** 1,7 ****
  from java.applet import Applet
  
  class HelloWorld(Applet):
      def paint(self, g):
! 	g.drawString("Hello from Jython!", 20, 30)
  
  
--- 1,8 ----
  from java.applet import Applet
+ import sys
  
  class HelloWorld(Applet):
      def paint(self, g):
! 	g.drawString("Hello from Jython %s!" % sys.version, 20, 30)

[Jython-checkins] CVS: jython/installer liftoff.filelist,1.18,1.19

From: Finn B. <bc...@us...> - 2001-07-29 19:42:33

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

Modified Files:
	liftoff.filelist 
Log Message:
Fix a mistake.



Index: liftoff.filelist
===================================================================
RCS file: /cvsroot/jython/jython/installer/liftoff.filelist,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** liftoff.filelist	2001/07/29 18:16:14	1.18
--- liftoff.filelist	2001/07/29 19:42:30	1.19
***************
*** 40,44 ****
  t Tools/jythonc/SimpleCompiler.py     ..\Tools\jythonc\SimpleCompiler.py
  t Tools/jythonc/util.py               ..\Tools\jythonc\util.py
- t Tools/jythonc/xx.py                 ..\Tools\jythonc\xx.py
  t Tools/jythonc/yapm.py               ..\Tools\jythonc\yapm.py
  t Tools/jythonc/jast/Modifier.py      ..\Tools\jythonc\jast\Modifier.py
--- 40,43 ----

[Jython-checkins] CVS: jython/installer liftoff.props,1.10,1.11

From: Finn B. <bc...@us...> - 2001-07-29 19:40:17

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

Modified Files:
	liftoff.props 
Log Message:
Prepare for alpha3.



Index: liftoff.props
===================================================================
RCS file: /cvsroot/jython/jython/installer/liftoff.props,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** liftoff.props	2001/07/18 11:00:07	1.10
--- liftoff.props	2001/07/29 19:40:14	1.11
***************
*** 2,9 ****
  product.author=The Jython Team
  product.string=Jython
! product.version=2.1a2
  java.minVersion=1.1
  product.root=
! destination.package_prefix=jython-2.1a2
  license.licenseText=LICENSE.txt
  product.readmeText=README.txt
--- 2,9 ----
  product.author=The Jython Team
  product.string=Jython
! product.version=2.1a3
  java.minVersion=1.1
  product.root=
! destination.package_prefix=jython-2.1a3
  license.licenseText=LICENSE.txt
  product.readmeText=README.txt

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

From: Finn B. <bc...@us...> - 2001-07-29 18:26:20

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

Modified Files:
	test309.py test310c.py 
Log Message:
Turn warnings into hard failures now that the bug is fixed.



Index: test309.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test309.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test309.py	2001/07/27 14:52:59	1.1
--- test309.py	2001/07/29 18:26:18	1.2
***************
*** 8,13 ****
      assert pickle == 1
      import pickle 
!     if pickle == 1:
!         raise support.TestWarning("An import should override a local")
      
  foo(1) 
--- 8,12 ----
      assert pickle == 1
      import pickle 
!     assert pickle != 1
      
  foo(1) 

Index: test310c.py
===================================================================
RCS file: /cvsroot/jython/bugtests/test310c.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test310c.py	2001/07/29 14:54:12	1.1
--- test310c.py	2001/07/29 18:26:18	1.2
***************
*** 8,13 ****
      assert pickle == 1
      import pickle 
!     if pickle == 1:
!         raise support.TestWarning("An import should override a local")
      
  foo(1) 
--- 8,12 ----
      assert pickle == 1
      import pickle 
!     assert pickle != 1
      
  foo(1)

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

From: Finn B. <bc...@us...> - 2001-07-29 18:24:18

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

Modified Files:
	driver.py 
Log Message:
Increased test range.



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

[Jython-checkins] CVS: jython/installer liftoff.filelist,1.17,1.18 mklist.py,1.18,1.19

From: Finn B. <bc...@us...> - 2001-07-29 18:16:17

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

Modified Files:
	liftoff.filelist mklist.py 
Log Message:
Prepare for alpha3 using libraries from CPython-2.1.1.



Index: liftoff.filelist
===================================================================
RCS file: /cvsroot/jython/jython/installer/liftoff.filelist,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** liftoff.filelist	2001/07/18 19:34:28	1.17
--- liftoff.filelist	2001/07/29 18:16:14	1.18
***************
*** 40,43 ****
--- 40,44 ----
  t Tools/jythonc/SimpleCompiler.py     ..\Tools\jythonc\SimpleCompiler.py
  t Tools/jythonc/util.py               ..\Tools\jythonc\util.py
+ t Tools/jythonc/xx.py                 ..\Tools\jythonc\xx.py
  t Tools/jythonc/yapm.py               ..\Tools\jythonc\yapm.py
  t Tools/jythonc/jast/Modifier.py      ..\Tools\jythonc\jast\Modifier.py
***************
*** 49,53 ****
  #
  t Lib/copy.py                         ..\Lib\copy.py
- t Lib/exceptions.py                   ..\Lib\exceptions.py
  t Lib/getopt.py                       ..\Lib\getopt.py
  t Lib/javaos.py                       ..\Lib\javaos.py
--- 50,53 ----
***************
*** 322,325 ****
--- 322,326 ----
  t org/python/core/PyList.java         ..\org\python\core\PyList.java
  t org/python/core/PyLong.java         ..\org\python\core\PyLong.java
+ t org/python/core/PyMetaClass.java    ..\org\python\core\PyMetaClass.java
  t org/python/core/PyMethod.java       ..\org\python\core\PyMethod.java
  t org/python/core/PyModule.java       ..\org\python\core\PyModule.java
***************
*** 349,352 ****
--- 350,354 ----
  t org/python/core/StdoutWrapper.java  ..\org\python\core\StdoutWrapper.java
  t org/python/core/SysPackageManager.java ..\org\python\core\SysPackageManager.java
+ t org/python/core/SyspathArchive.java ..\org\python\core\SyspathArchive.java
  t org/python/core/SyspathJavaLoader.java ..\org\python\core\SyspathJavaLoader.java
  t org/python/core/ThreadState.java    ..\org\python\core\ThreadState.java
***************
*** 394,398 ****
  t org/python/modules/sre/SRE_REPEAT.java ..\org\python\modules\sre\SRE_REPEAT.java
  t org/python/modules/sre/SRE_STATE.java ..\org\python\modules\sre\SRE_STATE.java
! t org/python/parser/ASCII_CharStream.java ..\org\python\parser\ASCII_CharStream.java
  t org/python/parser/JJTPythonGrammarState.java ..\org\python\parser\JJTPythonGrammarState.java
  t org/python/parser/Node.java         ..\org\python\parser\Node.java
--- 396,400 ----
  t org/python/modules/sre/SRE_REPEAT.java ..\org\python\modules\sre\SRE_REPEAT.java
  t org/python/modules/sre/SRE_STATE.java ..\org\python\modules\sre\SRE_STATE.java
! t org/python/parser/CharStream.java   ..\org\python\parser\CharStream.java
  t org/python/parser/JJTPythonGrammarState.java ..\org\python\parser\JJTPythonGrammarState.java
  t org/python/parser/Node.java         ..\org\python\parser\Node.java
***************
*** 403,406 ****
--- 405,409 ----
  t org/python/parser/PythonGrammarTokenManager.java ..\org\python\parser\PythonGrammarTokenManager.java
  t org/python/parser/PythonGrammarTreeConstants.java ..\org\python\parser\PythonGrammarTreeConstants.java
+ t org/python/parser/ReaderCharStream.java ..\org\python\parser\ReaderCharStream.java
  t org/python/parser/SimpleNode.java   ..\org\python\parser\SimpleNode.java
  t org/python/parser/Token.java        ..\org\python\parser\Token.java
***************
*** 414,418 ****
  t org/python/util/InteractiveInterpreter.java ..\org\python\util\InteractiveInterpreter.java
  t org/python/util/jython.java         ..\org\python\util\jython.java
- t org/python/util/PyMetaClass.java    ..\org\python\util\PyMetaClass.java
  t org/python/util/PyServlet.java      ..\org\python\util\PyServlet.java
  t org/python/util/PythonInterpreter.java ..\org\python\util\PythonInterpreter.java
--- 417,420 ----
***************
*** 429,603 ****
  #
  @lib:_top_
! t Lib/LICENSE d:/python/Python21\LICENSE.txt
! t Lib/__future__.py                   d:\python\Python21\Lib\__future__.py
! t Lib/BaseHTTPServer.py               d:\python\Python21\Lib\BaseHTTPServer.py
! t Lib/CGIHTTPServer.py                d:\python\Python21\Lib\CGIHTTPServer.py
! t Lib/ConfigParser.py                 d:\python\Python21\Lib\ConfigParser.py
! t Lib/Cookie.py                       d:\python\Python21\Lib\Cookie.py
! t Lib/MimeWriter.py                   d:\python\Python21\Lib\MimeWriter.py
! t Lib/Queue.py                        d:\python\Python21\Lib\Queue.py
! t Lib/SimpleHTTPServer.py             d:\python\Python21\Lib\SimpleHTTPServer.py
! t Lib/SocketServer.py                 d:\python\Python21\Lib\SocketServer.py
! t Lib/StringIO.py                     d:\python\Python21\Lib\StringIO.py
! t Lib/UserDict.py                     d:\python\Python21\Lib\UserDict.py
! t Lib/UserList.py                     d:\python\Python21\Lib\UserList.py
! t Lib/anydbm.py                       d:\python\Python21\Lib\anydbm.py
! t Lib/base64.py                       d:\python\Python21\Lib\base64.py
! t Lib/bdb.py                          d:\python\Python21\Lib\bdb.py
! t Lib/binhex.py                       d:\python\Python21\Lib\binhex.py
! t Lib/bisect.py                       d:\python\Python21\Lib\bisect.py
! t Lib/calendar.py                     d:\python\Python21\Lib\calendar.py
! t Lib/cgi.py                          d:\python\Python21\Lib\cgi.py
! t Lib/cmd.py                          d:\python\Python21\Lib\cmd.py
! t Lib/colorsys.py                     d:\python\Python21\Lib\colorsys.py
! t Lib/commands.py                     d:\python\Python21\Lib\commands.py
! t Lib/compileall.py                   d:\python\Python21\Lib\compileall.py
! t Lib/copy_reg.py                     d:\python\Python21\Lib\copy_reg.py
! t Lib/dircache.py                     d:\python\Python21\Lib\dircache.py
! t Lib/dospath.py                      d:\python\Python21\Lib\dospath.py
! t Lib/dumbdbm.py                      d:\python\Python21\Lib\dumbdbm.py
! t Lib/fileinput.py                    d:\python\Python21\Lib\fileinput.py
! t Lib/fnmatch.py                      d:\python\Python21\Lib\fnmatch.py
! t Lib/formatter.py                    d:\python\Python21\Lib\formatter.py
! t Lib/fpformat.py                     d:\python\Python21\Lib\fpformat.py
! t Lib/ftplib.py                       d:\python\Python21\Lib\ftplib.py
! t Lib/getopt.py                       d:\python\Python21\Lib\getopt.py
! t Lib/glob.py                         d:\python\Python21\Lib\glob.py
! t Lib/gopherlib.py                    d:\python\Python21\Lib\gopherlib.py
! t Lib/gzip.py                         d:\python\Python21\Lib\gzip.py
! t Lib/htmlentitydefs.py               d:\python\Python21\Lib\htmlentitydefs.py
! t Lib/htmllib.py                      d:\python\Python21\Lib\htmllib.py
! t Lib/httplib.py                      d:\python\Python21\Lib\httplib.py
! t Lib/imaplib.py                      d:\python\Python21\Lib\imaplib.py
! t Lib/imghdr.py                       d:\python\Python21\Lib\imghdr.py
! t Lib/keyword.py                      d:\python\Python21\Lib\keyword.py
! t Lib/linecache.py                    d:\python\Python21\Lib\linecache.py
! t Lib/macpath.py                      d:\python\Python21\Lib\macpath.py
! t Lib/macurl2path.py                  d:\python\Python21\Lib\macurl2path.py
! t Lib/mailbox.py                      d:\python\Python21\Lib\mailbox.py
! t Lib/mailcap.py                      d:\python\Python21\Lib\mailcap.py
! t Lib/mhlib.py                        d:\python\Python21\Lib\mhlib.py
! t Lib/mimetools.py                    d:\python\Python21\Lib\mimetools.py
! t Lib/mimetypes.py                    d:\python\Python21\Lib\mimetypes.py
! t Lib/mimify.py                       d:\python\Python21\Lib\mimify.py
! t Lib/multifile.py                    d:\python\Python21\Lib\multifile.py
! t Lib/mutex.py                        d:\python\Python21\Lib\mutex.py
! t Lib/nntplib.py                      d:\python\Python21\Lib\nntplib.py
! t Lib/ntpath.py                       d:\python\Python21\Lib\ntpath.py
! t Lib/nturl2path.py                   d:\python\Python21\Lib\nturl2path.py
! t Lib/pdb.py                          d:\python\Python21\Lib\pdb.py
! t Lib/pickle.py                       d:\python\Python21\Lib\pickle.py
! t Lib/pipes.py                        d:\python\Python21\Lib\pipes.py
! t Lib/popen2.py                       d:\python\Python21\Lib\popen2.py
! t Lib/poplib.py                       d:\python\Python21\Lib\poplib.py
! t Lib/posixfile.py                    d:\python\Python21\Lib\posixfile.py
! t Lib/posixpath.py                    d:\python\Python21\Lib\posixpath.py
! t Lib/pprint.py                       d:\python\Python21\Lib\pprint.py
! t Lib/profile.py                      d:\python\Python21\Lib\profile.py
! t Lib/pyclbr.py                       d:\python\Python21\Lib\pyclbr.py
! t Lib/quopri.py                       d:\python\Python21\Lib\quopri.py
! t Lib/random.py                       d:\python\Python21\Lib\random.py
! t Lib/reconvert.py                    d:\python\Python21\Lib\reconvert.py
! t Lib/repr.py                         d:\python\Python21\Lib\repr.py
! t Lib/rfc822.py                       d:\python\Python21\Lib\rfc822.py
! t Lib/sched.py                        d:\python\Python21\Lib\sched.py
! t Lib/sgmllib.py                      d:\python\Python21\Lib\sgmllib.py
! t Lib/site.py                         d:\python\Python21\Lib\site.py
! t Lib/shelve.py                       d:\python\Python21\Lib\shelve.py
! t Lib/shutil.py                       d:\python\Python21\Lib\shutil.py
! t Lib/smtplib.py                      d:\python\Python21\Lib\smtplib.py
! t Lib/sndhdr.py                       d:\python\Python21\Lib\sndhdr.py
! t Lib/stat.py                         d:\python\Python21\Lib\stat.py
! t Lib/symbol.py                       d:\python\Python21\Lib\symbol.py
! t Lib/telnetlib.py                    d:\python\Python21\Lib\telnetlib.py
! t Lib/tempfile.py                     d:\python\Python21\Lib\tempfile.py
! t Lib/token.py                        d:\python\Python21\Lib\token.py
! t Lib/tokenize.py                     d:\python\Python21\Lib\tokenize.py
! t Lib/traceback.py                    d:\python\Python21\Lib\traceback.py
! t Lib/tzparse.py                      d:\python\Python21\Lib\tzparse.py
! t Lib/urllib.py                       d:\python\Python21\Lib\urllib.py
! t Lib/urlparse.py                     d:\python\Python21\Lib\urlparse.py
! t Lib/user.py                         d:\python\Python21\Lib\user.py
! t Lib/whichdb.py                      d:\python\Python21\Lib\whichdb.py
! t Lib/whrandom.py                     d:\python\Python21\Lib\whrandom.py
! t Lib/xdrlib.py                       d:\python\Python21\Lib\xdrlib.py
! t Lib/xmllib.py                       d:\python\Python21\Lib\xmllib.py
! t Lib/test/pystone.py                 d:\python\Python21\Lib\test\pystone.py
! t Lib/pstats.py                       d:\python\Python21\Lib\pstats.py
! t Lib/code.py                         d:\python\Python21\Lib\code.py
! t Lib/codecs.py                       d:\python\Python21\Lib\codecs.py
! t Lib/sre.py                          d:\python\Python21\Lib\sre.py
! t Lib/sre_compile.py                  d:\python\Python21\Lib\sre_compile.py
! t Lib/sre_constants.py                d:\python\Python21\Lib\sre_constants.py
! t Lib/sre_parse.py                    d:\python\Python21\Lib\sre_parse.py
! t Lib/encodings/aliases.py            d:\python\Python21\Lib\encodings\aliases.py
! t Lib/encodings/ascii.py              d:\python\Python21\Lib\encodings\ascii.py
! t Lib/encodings/charmap.py            d:\python\Python21\Lib\encodings\charmap.py
! t Lib/encodings/cp037.py              d:\python\Python21\Lib\encodings\cp037.py
! t Lib/encodings/cp1006.py             d:\python\Python21\Lib\encodings\cp1006.py
! t Lib/encodings/cp1026.py             d:\python\Python21\Lib\encodings\cp1026.py
! t Lib/encodings/cp1250.py             d:\python\Python21\Lib\encodings\cp1250.py
! t Lib/encodings/cp1251.py             d:\python\Python21\Lib\encodings\cp1251.py
! t Lib/encodings/cp1252.py             d:\python\Python21\Lib\encodings\cp1252.py
! t Lib/encodings/cp1253.py             d:\python\Python21\Lib\encodings\cp1253.py
! t Lib/encodings/cp1254.py             d:\python\Python21\Lib\encodings\cp1254.py
! t Lib/encodings/cp1255.py             d:\python\Python21\Lib\encodings\cp1255.py
! t Lib/encodings/cp1256.py             d:\python\Python21\Lib\encodings\cp1256.py
! t Lib/encodings/cp1257.py             d:\python\Python21\Lib\encodings\cp1257.py
! t Lib/encodings/cp1258.py             d:\python\Python21\Lib\encodings\cp1258.py
! t Lib/encodings/cp424.py              d:\python\Python21\Lib\encodings\cp424.py
! t Lib/encodings/cp437.py              d:\python\Python21\Lib\encodings\cp437.py
! t Lib/encodings/cp500.py              d:\python\Python21\Lib\encodings\cp500.py
! t Lib/encodings/cp737.py              d:\python\Python21\Lib\encodings\cp737.py
! t Lib/encodings/cp775.py              d:\python\Python21\Lib\encodings\cp775.py
! t Lib/encodings/cp850.py              d:\python\Python21\Lib\encodings\cp850.py
! t Lib/encodings/cp852.py              d:\python\Python21\Lib\encodings\cp852.py
! t Lib/encodings/cp855.py              d:\python\Python21\Lib\encodings\cp855.py
! t Lib/encodings/cp856.py              d:\python\Python21\Lib\encodings\cp856.py
! t Lib/encodings/cp857.py              d:\python\Python21\Lib\encodings\cp857.py
! t Lib/encodings/cp860.py              d:\python\Python21\Lib\encodings\cp860.py
! t Lib/encodings/cp861.py              d:\python\Python21\Lib\encodings\cp861.py
! t Lib/encodings/cp862.py              d:\python\Python21\Lib\encodings\cp862.py
! t Lib/encodings/cp863.py              d:\python\Python21\Lib\encodings\cp863.py
! t Lib/encodings/cp864.py              d:\python\Python21\Lib\encodings\cp864.py
! t Lib/encodings/cp865.py              d:\python\Python21\Lib\encodings\cp865.py
! t Lib/encodings/cp866.py              d:\python\Python21\Lib\encodings\cp866.py
! t Lib/encodings/cp869.py              d:\python\Python21\Lib\encodings\cp869.py
! t Lib/encodings/cp874.py              d:\python\Python21\Lib\encodings\cp874.py
! t Lib/encodings/cp875.py              d:\python\Python21\Lib\encodings\cp875.py
! t Lib/encodings/iso8859_1.py          d:\python\Python21\Lib\encodings\iso8859_1.py
! t Lib/encodings/iso8859_10.py         d:\python\Python21\Lib\encodings\iso8859_10.py
! t Lib/encodings/iso8859_13.py         d:\python\Python21\Lib\encodings\iso8859_13.py
! t Lib/encodings/iso8859_14.py         d:\python\Python21\Lib\encodings\iso8859_14.py
! t Lib/encodings/iso8859_15.py         d:\python\Python21\Lib\encodings\iso8859_15.py
! t Lib/encodings/iso8859_2.py          d:\python\Python21\Lib\encodings\iso8859_2.py
! t Lib/encodings/iso8859_3.py          d:\python\Python21\Lib\encodings\iso8859_3.py
! t Lib/encodings/iso8859_4.py          d:\python\Python21\Lib\encodings\iso8859_4.py
! t Lib/encodings/iso8859_5.py          d:\python\Python21\Lib\encodings\iso8859_5.py
! t Lib/encodings/iso8859_6.py          d:\python\Python21\Lib\encodings\iso8859_6.py
! t Lib/encodings/iso8859_7.py          d:\python\Python21\Lib\encodings\iso8859_7.py
! t Lib/encodings/iso8859_8.py          d:\python\Python21\Lib\encodings\iso8859_8.py
! t Lib/encodings/iso8859_9.py          d:\python\Python21\Lib\encodings\iso8859_9.py
! t Lib/encodings/koi8_r.py             d:\python\Python21\Lib\encodings\koi8_r.py
! t Lib/encodings/latin_1.py            d:\python\Python21\Lib\encodings\latin_1.py
! t Lib/encodings/mac_cyrillic.py       d:\python\Python21\Lib\encodings\mac_cyrillic.py
! t Lib/encodings/mac_greek.py          d:\python\Python21\Lib\encodings\mac_greek.py
! t Lib/encodings/mac_iceland.py        d:\python\Python21\Lib\encodings\mac_iceland.py
! t Lib/encodings/mac_latin2.py         d:\python\Python21\Lib\encodings\mac_latin2.py
! t Lib/encodings/mac_roman.py          d:\python\Python21\Lib\encodings\mac_roman.py
! t Lib/encodings/mac_turkish.py        d:\python\Python21\Lib\encodings\mac_turkish.py
! t Lib/encodings/mbcs.py               d:\python\Python21\Lib\encodings\mbcs.py
! t Lib/encodings/raw_unicode_escape.py d:\python\Python21\Lib\encodings\raw_unicode_escape.py
! t Lib/encodings/undefined.py          d:\python\Python21\Lib\encodings\undefined.py
! t Lib/encodings/unicode_escape.py     d:\python\Python21\Lib\encodings\unicode_escape.py
! t Lib/encodings/unicode_internal.py   d:\python\Python21\Lib\encodings\unicode_internal.py
! t Lib/encodings/utf_16.py             d:\python\Python21\Lib\encodings\utf_16.py
! t Lib/encodings/utf_16_be.py          d:\python\Python21\Lib\encodings\utf_16_be.py
! t Lib/encodings/utf_16_le.py          d:\python\Python21\Lib\encodings\utf_16_le.py
! t Lib/encodings/utf_8.py              d:\python\Python21\Lib\encodings\utf_8.py
! t Lib/encodings/__init__.py           d:\python\Python21\Lib\encodings\__init__.py
! t Lib/threading.py                    d:\python\Python21\Lib\threading.py
! t Lib/atexit.py                       d:\python\Python21\Lib\atexit.py
! t Lib/UserString.py                   d:\python\Python21\Lib\UserString.py
! t Lib/warnings.py                     d:\python\Python21\Lib\warnings.py
  #===== end of list generated by mklist.py =====
--- 431,605 ----
  #
  @lib:_top_
! t Lib/LICENSE d:/python/Python211\LICENSE.txt
! t Lib/__future__.py                   d:\python\Python211\Lib\__future__.py
! t Lib/BaseHTTPServer.py               d:\python\Python211\Lib\BaseHTTPServer.py
! t Lib/CGIHTTPServer.py                d:\python\Python211\Lib\CGIHTTPServer.py
! t Lib/ConfigParser.py                 d:\python\Python211\Lib\ConfigParser.py
! t Lib/Cookie.py                       d:\python\Python211\Lib\Cookie.py
! t Lib/MimeWriter.py                   d:\python\Python211\Lib\MimeWriter.py
! t Lib/Queue.py                        d:\python\Python211\Lib\Queue.py
! t Lib/SimpleHTTPServer.py             d:\python\Python211\Lib\SimpleHTTPServer.py
! t Lib/SocketServer.py                 d:\python\Python211\Lib\SocketServer.py
! t Lib/StringIO.py                     d:\python\Python211\Lib\StringIO.py
! t Lib/UserDict.py                     d:\python\Python211\Lib\UserDict.py
! t Lib/UserList.py                     d:\python\Python211\Lib\UserList.py
! t Lib/anydbm.py                       d:\python\Python211\Lib\anydbm.py
! t Lib/base64.py                       d:\python\Python211\Lib\base64.py
! t Lib/bdb.py                          d:\python\Python211\Lib\bdb.py
! t Lib/binhex.py                       d:\python\Python211\Lib\binhex.py
! t Lib/bisect.py                       d:\python\Python211\Lib\bisect.py
! t Lib/calendar.py                     d:\python\Python211\Lib\calendar.py
! t Lib/cgi.py                          d:\python\Python211\Lib\cgi.py
! t Lib/cmd.py                          d:\python\Python211\Lib\cmd.py
! t Lib/colorsys.py                     d:\python\Python211\Lib\colorsys.py
! t Lib/commands.py                     d:\python\Python211\Lib\commands.py
! t Lib/compileall.py                   d:\python\Python211\Lib\compileall.py
! t Lib/copy_reg.py                     d:\python\Python211\Lib\copy_reg.py
! t Lib/dircache.py                     d:\python\Python211\Lib\dircache.py
! t Lib/dospath.py                      d:\python\Python211\Lib\dospath.py
! t Lib/dumbdbm.py                      d:\python\Python211\Lib\dumbdbm.py
! t Lib/fileinput.py                    d:\python\Python211\Lib\fileinput.py
! t Lib/fnmatch.py                      d:\python\Python211\Lib\fnmatch.py
! t Lib/formatter.py                    d:\python\Python211\Lib\formatter.py
! t Lib/fpformat.py                     d:\python\Python211\Lib\fpformat.py
! t Lib/ftplib.py                       d:\python\Python211\Lib\ftplib.py
! t Lib/getopt.py                       d:\python\Python211\Lib\getopt.py
! t Lib/glob.py                         d:\python\Python211\Lib\glob.py
! t Lib/gopherlib.py                    d:\python\Python211\Lib\gopherlib.py
! t Lib/gzip.py                         d:\python\Python211\Lib\gzip.py
! t Lib/htmlentitydefs.py               d:\python\Python211\Lib\htmlentitydefs.py
! t Lib/htmllib.py                      d:\python\Python211\Lib\htmllib.py
! t Lib/httplib.py                      d:\python\Python211\Lib\httplib.py
! t Lib/imaplib.py                      d:\python\Python211\Lib\imaplib.py
! t Lib/imghdr.py                       d:\python\Python211\Lib\imghdr.py
! t Lib/keyword.py                      d:\python\Python211\Lib\keyword.py
! t Lib/linecache.py                    d:\python\Python211\Lib\linecache.py
! t Lib/macpath.py                      d:\python\Python211\Lib\macpath.py
! t Lib/macurl2path.py                  d:\python\Python211\Lib\macurl2path.py
! t Lib/mailbox.py                      d:\python\Python211\Lib\mailbox.py
! t Lib/mailcap.py                      d:\python\Python211\Lib\mailcap.py
! t Lib/mhlib.py                        d:\python\Python211\Lib\mhlib.py
! t Lib/mimetools.py                    d:\python\Python211\Lib\mimetools.py
! t Lib/mimetypes.py                    d:\python\Python211\Lib\mimetypes.py
! t Lib/mimify.py                       d:\python\Python211\Lib\mimify.py
! t Lib/multifile.py                    d:\python\Python211\Lib\multifile.py
! t Lib/mutex.py                        d:\python\Python211\Lib\mutex.py
! t Lib/nntplib.py                      d:\python\Python211\Lib\nntplib.py
! t Lib/ntpath.py                       d:\python\Python211\Lib\ntpath.py
! t Lib/nturl2path.py                   d:\python\Python211\Lib\nturl2path.py
! t Lib/pdb.py                          d:\python\Python211\Lib\pdb.py
! t Lib/pickle.py                       d:\python\Python211\Lib\pickle.py
! t Lib/pipes.py                        d:\python\Python211\Lib\pipes.py
! t Lib/popen2.py                       d:\python\Python211\Lib\popen2.py
! t Lib/poplib.py                       d:\python\Python211\Lib\poplib.py
! t Lib/posixfile.py                    d:\python\Python211\Lib\posixfile.py
! t Lib/posixpath.py                    d:\python\Python211\Lib\posixpath.py
! t Lib/pprint.py                       d:\python\Python211\Lib\pprint.py
! t Lib/profile.py                      d:\python\Python211\Lib\profile.py
! t Lib/pyclbr.py                       d:\python\Python211\Lib\pyclbr.py
! t Lib/quopri.py                       d:\python\Python211\Lib\quopri.py
! t Lib/random.py                       d:\python\Python211\Lib\random.py
! t Lib/reconvert.py                    d:\python\Python211\Lib\reconvert.py
! t Lib/repr.py                         d:\python\Python211\Lib\repr.py
! t Lib/rfc822.py                       d:\python\Python211\Lib\rfc822.py
! t Lib/sched.py                        d:\python\Python211\Lib\sched.py
! t Lib/sgmllib.py                      d:\python\Python211\Lib\sgmllib.py
! t Lib/site.py                         d:\python\Python211\Lib\site.py
! t Lib/shelve.py                       d:\python\Python211\Lib\shelve.py
! t Lib/shutil.py                       d:\python\Python211\Lib\shutil.py
! t Lib/smtplib.py                      d:\python\Python211\Lib\smtplib.py
! t Lib/sndhdr.py                       d:\python\Python211\Lib\sndhdr.py
! t Lib/stat.py                         d:\python\Python211\Lib\stat.py
! t Lib/symbol.py                       d:\python\Python211\Lib\symbol.py
! t Lib/telnetlib.py                    d:\python\Python211\Lib\telnetlib.py
! t Lib/tempfile.py                     d:\python\Python211\Lib\tempfile.py
! t Lib/token.py                        d:\python\Python211\Lib\token.py
! t Lib/tokenize.py                     d:\python\Python211\Lib\tokenize.py
! t Lib/traceback.py                    d:\python\Python211\Lib\traceback.py
! t Lib/tzparse.py                      d:\python\Python211\Lib\tzparse.py
! t Lib/urllib.py                       d:\python\Python211\Lib\urllib.py
! t Lib/urlparse.py                     d:\python\Python211\Lib\urlparse.py
! t Lib/user.py                         d:\python\Python211\Lib\user.py
! t Lib/whichdb.py                      d:\python\Python211\Lib\whichdb.py
! t Lib/whrandom.py                     d:\python\Python211\Lib\whrandom.py
! t Lib/xdrlib.py                       d:\python\Python211\Lib\xdrlib.py
! t Lib/xmllib.py                       d:\python\Python211\Lib\xmllib.py
! t Lib/test/pystone.py                 d:\python\Python211\Lib\test\pystone.py
! t Lib/pstats.py                       d:\python\Python211\Lib\pstats.py
! t Lib/code.py                         d:\python\Python211\Lib\code.py
! t Lib/codecs.py                       d:\python\Python211\Lib\codecs.py
! t Lib/sre.py                          d:\python\Python211\Lib\sre.py
! t Lib/sre_compile.py                  d:\python\Python211\Lib\sre_compile.py
! t Lib/sre_constants.py                d:\python\Python211\Lib\sre_constants.py
! t Lib/sre_parse.py                    d:\python\Python211\Lib\sre_parse.py
! t Lib/encodings/aliases.py            d:\python\Python211\Lib\encodings\aliases.py
! t Lib/encodings/ascii.py              d:\python\Python211\Lib\encodings\ascii.py
! t Lib/encodings/charmap.py            d:\python\Python211\Lib\encodings\charmap.py
! t Lib/encodings/cp037.py              d:\python\Python211\Lib\encodings\cp037.py
! t Lib/encodings/cp1006.py             d:\python\Python211\Lib\encodings\cp1006.py
! t Lib/encodings/cp1026.py             d:\python\Python211\Lib\encodings\cp1026.py
! t Lib/encodings/cp1250.py             d:\python\Python211\Lib\encodings\cp1250.py
! t Lib/encodings/cp1251.py             d:\python\Python211\Lib\encodings\cp1251.py
! t Lib/encodings/cp1252.py             d:\python\Python211\Lib\encodings\cp1252.py
! t Lib/encodings/cp1253.py             d:\python\Python211\Lib\encodings\cp1253.py
! t Lib/encodings/cp1254.py             d:\python\Python211\Lib\encodings\cp1254.py
! t Lib/encodings/cp1255.py             d:\python\Python211\Lib\encodings\cp1255.py
! t Lib/encodings/cp1256.py             d:\python\Python211\Lib\encodings\cp1256.py
! t Lib/encodings/cp1257.py             d:\python\Python211\Lib\encodings\cp1257.py
! t Lib/encodings/cp1258.py             d:\python\Python211\Lib\encodings\cp1258.py
! t Lib/encodings/cp424.py              d:\python\Python211\Lib\encodings\cp424.py
! t Lib/encodings/cp437.py              d:\python\Python211\Lib\encodings\cp437.py
! t Lib/encodings/cp500.py              d:\python\Python211\Lib\encodings\cp500.py
! t Lib/encodings/cp737.py              d:\python\Python211\Lib\encodings\cp737.py
! t Lib/encodings/cp775.py              d:\python\Python211\Lib\encodings\cp775.py
! t Lib/encodings/cp850.py              d:\python\Python211\Lib\encodings\cp850.py
! t Lib/encodings/cp852.py              d:\python\Python211\Lib\encodings\cp852.py
! t Lib/encodings/cp855.py              d:\python\Python211\Lib\encodings\cp855.py
! t Lib/encodings/cp856.py              d:\python\Python211\Lib\encodings\cp856.py
! t Lib/encodings/cp857.py              d:\python\Python211\Lib\encodings\cp857.py
! t Lib/encodings/cp860.py              d:\python\Python211\Lib\encodings\cp860.py
! t Lib/encodings/cp861.py              d:\python\Python211\Lib\encodings\cp861.py
! t Lib/encodings/cp862.py              d:\python\Python211\Lib\encodings\cp862.py
! t Lib/encodings/cp863.py              d:\python\Python211\Lib\encodings\cp863.py
! t Lib/encodings/cp864.py              d:\python\Python211\Lib\encodings\cp864.py
! t Lib/encodings/cp865.py              d:\python\Python211\Lib\encodings\cp865.py
! t Lib/encodings/cp866.py              d:\python\Python211\Lib\encodings\cp866.py
! t Lib/encodings/cp869.py              d:\python\Python211\Lib\encodings\cp869.py
! t Lib/encodings/cp874.py              d:\python\Python211\Lib\encodings\cp874.py
! t Lib/encodings/cp875.py              d:\python\Python211\Lib\encodings\cp875.py
! t Lib/encodings/iso8859_1.py          d:\python\Python211\Lib\encodings\iso8859_1.py
! t Lib/encodings/iso8859_10.py         d:\python\Python211\Lib\encodings\iso8859_10.py
! t Lib/encodings/iso8859_13.py         d:\python\Python211\Lib\encodings\iso8859_13.py
! t Lib/encodings/iso8859_14.py         d:\python\Python211\Lib\encodings\iso8859_14.py
! t Lib/encodings/iso8859_15.py         d:\python\Python211\Lib\encodings\iso8859_15.py
! t Lib/encodings/iso8859_2.py          d:\python\Python211\Lib\encodings\iso8859_2.py
! t Lib/encodings/iso8859_3.py          d:\python\Python211\Lib\encodings\iso8859_3.py
! t Lib/encodings/iso8859_4.py          d:\python\Python211\Lib\encodings\iso8859_4.py
! t Lib/encodings/iso8859_5.py          d:\python\Python211\Lib\encodings\iso8859_5.py
! t Lib/encodings/iso8859_6.py          d:\python\Python211\Lib\encodings\iso8859_6.py
! t Lib/encodings/iso8859_7.py          d:\python\Python211\Lib\encodings\iso8859_7.py
! t Lib/encodings/iso8859_8.py          d:\python\Python211\Lib\encodings\iso8859_8.py
! t Lib/encodings/iso8859_9.py          d:\python\Python211\Lib\encodings\iso8859_9.py
! t Lib/encodings/koi8_r.py             d:\python\Python211\Lib\encodings\koi8_r.py
! t Lib/encodings/latin_1.py            d:\python\Python211\Lib\encodings\latin_1.py
! t Lib/encodings/mac_cyrillic.py       d:\python\Python211\Lib\encodings\mac_cyrillic.py
! t Lib/encodings/mac_greek.py          d:\python\Python211\Lib\encodings\mac_greek.py
! t Lib/encodings/mac_iceland.py        d:\python\Python211\Lib\encodings\mac_iceland.py
! t Lib/encodings/mac_latin2.py         d:\python\Python211\Lib\encodings\mac_latin2.py
! t Lib/encodings/mac_roman.py          d:\python\Python211\Lib\encodings\mac_roman.py
! t Lib/encodings/mac_turkish.py        d:\python\Python211\Lib\encodings\mac_turkish.py
! t Lib/encodings/mbcs.py               d:\python\Python211\Lib\encodings\mbcs.py
! t Lib/encodings/raw_unicode_escape.py d:\python\Python211\Lib\encodings\raw_unicode_escape.py
! t Lib/encodings/undefined.py          d:\python\Python211\Lib\encodings\undefined.py
! t Lib/encodings/unicode_escape.py     d:\python\Python211\Lib\encodings\unicode_escape.py
! t Lib/encodings/unicode_internal.py   d:\python\Python211\Lib\encodings\unicode_internal.py
! t Lib/encodings/utf_16.py             d:\python\Python211\Lib\encodings\utf_16.py
! t Lib/encodings/utf_16_be.py          d:\python\Python211\Lib\encodings\utf_16_be.py
! t Lib/encodings/utf_16_le.py          d:\python\Python211\Lib\encodings\utf_16_le.py
! t Lib/encodings/utf_8.py              d:\python\Python211\Lib\encodings\utf_8.py
! t Lib/encodings/__init__.py           d:\python\Python211\Lib\encodings\__init__.py
! t Lib/threading.py                    d:\python\Python211\Lib\threading.py
! t Lib/atexit.py                       d:\python\Python211\Lib\atexit.py
! t Lib/UserString.py                   d:\python\Python211\Lib\UserString.py
! t Lib/warnings.py                     d:\python\Python211\Lib\warnings.py
  #===== end of list generated by mklist.py =====

Index: mklist.py
===================================================================
RCS file: /cvsroot/jython/jython/installer/mklist.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mklist.py	2001/07/18 19:34:28	1.18
--- mklist.py	2001/07/29 18:16:14	1.19
***************
*** 2,6 ****
  import glob, os
  
! PYTHONDIR = r"d:/python/Python21"
  
  def listfiles(root, d, *masks, **kws):
--- 2,6 ----
  import glob, os
  
! PYTHONDIR = r"d:/python/Python211"
  
  def listfiles(root, d, *masks, **kws):

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

From: Finn B. <bc...@us...> - 2001-07-29 17:13:48

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

Modified Files:
	time.java 
Log Message:
[ #445364 ] time.ctime returning strange chars

Added default arg to localtime(), gmtime(), ctime(), asctime() and
strftime().



Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** time.java	2001/04/17 19:03:02	2.14
--- time.java	2001/07/29 17:13:46	2.15
***************
*** 263,274 ****
--- 263,286 ----
      }
  
+     public static PyTuple localtime() {
+         return localtime(time$());
+     }
+ 
      public static PyTuple localtime(double secs) {
          return _timefields(secs, TimeZone.getDefault());
      }
  
+     public static PyTuple gmtime() {
+         return gmtime(time$());
+     }
+ 
      public static PyTuple gmtime(double secs) {
          return _timefields(secs, TimeZone.getTimeZone("GMT"));
      }
  
+     public static String ctime() {
+         return ctime(time$());
+     }
+ 
      public static String ctime(double secs) {
          return asctime(localtime(secs));
***************
*** 346,349 ****
--- 358,365 ----
      }
  
+     public static String asctime() {
+         return asctime(localtime());
+     }
+ 
      public static String asctime(PyTuple tup) {
          checkLocale();
***************
*** 375,378 ****
--- 391,398 ----
      // writable but ignore its value?
      public static final int accept2dyear = 0;
+ 
+     public static String strftime(String format) {
+         return strftime(format, localtime());
+     }
  
      public static String strftime(String format, PyTuple tup) {

[Jython-checkins] CVS: jython/Lib exceptions.py,1.3,NONE

From: Finn B. <bc...@us...> - 2001-07-29 15:08:56

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

Removed Files:
	exceptions.py 
Log Message:
After exceptions became a handcoded builtin module, this file no 
longer used.



--- exceptions.py DELETED ---

[Jython-checkins] CVS: jython/Tools/jythonc/jast Statement.py,2.4,2.5

From: Finn B. <bc...@us...> - 2001-07-29 14:59:16

Update of /cvsroot/jython/jython/Tools/jythonc/jast
In directory usw-pr-cvs1:/tmp/cvs-serv23530/Tools/jythonc/jast

Modified Files:
	Statement.py 
Log Message:
Patch [ #444911 ] which fixes bug #444292 local var binding overrides fix



Index: Statement.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/jast/Statement.py,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** Statement.py	2000/11/08 08:20:16	2.4
--- Statement.py	2001/07/29 14:59:13	2.5
***************
*** 564,567 ****
--- 564,576 ----
  
  
+ class Subscript(UnsafeExpression):
+     def __init__(self, x, ind):
+         self.ind = ind
+         self.x = x
+ 
+     def sourceString(self):
+         return "%s[%s]" % (self.x.safeSourceString(), self.ind)
+ 
+ 
  
  class InvokeLocal(Expression):

[Jython-checkins] CVS: jython/Tools/jythonc BaseEvaluator.py,2.10,2.11 SimpleCompiler.py,2.14,2.15

From: Finn B. <bc...@us...> - 2001-07-29 14:59:16

Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv23530/Tools/jythonc

Modified Files:
	BaseEvaluator.py SimpleCompiler.py 
Log Message:
Patch [ #444911 ] which fixes bug #444292 local var binding overrides fix



Index: BaseEvaluator.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/BaseEvaluator.py,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** BaseEvaluator.py	2001/05/27 18:50:56	2.10
--- BaseEvaluator.py	2001/07/29 14:59:13	2.11
***************
*** 13,16 ****
--- 13,17 ----
          self.lineno = -1
          self.visitor = PythonVisitor(self)
+         self.imp_accu = None
  
      def parse(self, node):
***************
*** 165,168 ****
--- 166,171 ----
      def freeTemp(self, tmp): pass
  
+     def makeFreeDecl(self,type,value): pass
+ 
      def expr_stmt(self, lhss, rhs):
          if len(lhss) == 0:
***************
*** 272,289 ****
              if asname is None:
                  asname = modname
-             self.set_name(asname, module.getattr(modname))
              asnames.append(asname)
              modnames.append(modname)
  
          topmodname = jast.StringConstant(".".join(top))
!         modnames = jast.FilledArray(
              "String",
              map(lambda x: jast.StringConstant(x), modnames))
!         asnames = jast.FilledArray(
!             "String",
!             map(lambda x: jast.StringConstant(x), asnames))
!         return jast.InvokeStatic(
!             "org.python.core.imp", "importFromAs",
!             [topmodname, modnames, asnames, self.frame.frame])
  
      #external interfaces
--- 275,306 ----
              if asname is None:
                  asname = modname
              asnames.append(asname)
              modnames.append(modname)
  
          topmodname = jast.StringConstant(".".join(top))
!         modnamesArray = jast.FilledArray(
              "String",
              map(lambda x: jast.StringConstant(x), modnames))
! 
!         do_import = jast.InvokeStatic("org.python.core.imp", "importFrom",
!                                       [topmodname, modnamesArray,
!                                        self.frame.frame])
! 
!         if not self.imp_accu:
!             imp_accu = self.imp_accu = jast.Identifier("imp_accu")
!             self.makeFreeDecl("PyObject[]",imp_accu)
!         else:
!             imp_accu = self.imp_accu
!         
!         stmts = [jast.Set(imp_accu,do_import)]
!         
!         for i in range(len(asnames)):
!             asname = asnames[i]
!             modname = modnames[i]
!             code = jast.Subscript(imp_accu,i)
!             stmts.append(self.set_name(asname, 
!          	module.getattr(modname).makeReference(code)))
! 
!         return stmts       
  
      #external interfaces

Index: SimpleCompiler.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/SimpleCompiler.py,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** SimpleCompiler.py	2001/05/27 18:50:56	2.14
--- SimpleCompiler.py	2001/07/29 14:59:13	2.15
***************
*** 254,257 ****
--- 254,259 ----
          self.listComprehensionStack = []
  
+         self.free_decls = []
+ 
      def isAlwaysFalse(self, name):
          if self.options is None:
***************
*** 282,286 ****
          ret = BaseEvaluator.parse(self, node)
          #print 'parse', ret
!         decs = self.frame.getDeclarations()
          if len(decs) != 0:
              return [decs, jast.SimpleComment('Code'), ret]
--- 284,288 ----
          ret = BaseEvaluator.parse(self, node)
          #print 'parse', ret
!         decs = self.free_decls + self.frame.getDeclarations()
          if len(decs) != 0:
              return [decs, jast.SimpleComment('Code'), ret]
***************
*** 296,299 ****
--- 298,304 ----
          self.frame.freetemp(tmp.asAny())
  
+     def makeFreeDecl(self,type,value):
+         self.free_decls.append(jast.Declare(type,value))
+ 
      #primitive values
      def int_const(self, value):
***************
*** 436,451 ****
          ret = []
          for dotted, asname in names:
!             modname = jast.StringConstant(".".join(dotted))
              if asname:
!                 self.set_name(asname, self.get_module(dotted,0))
!                 asname = jast.StringConstant(asname)
!                 ret.append(jast.InvokeStatic("org.python.core.imp",
!                                 "importOneAs",
!                                  [modname, asname, self.frame.frame]))
              else:
!                 self.set_name(dotted[0], self.get_module(dotted,1))
!                 ret.append(jast.InvokeStatic("org.python.core.imp",
!                                 "importOne",
!                                  [modname, self.frame.frame]))
          return ret
  
--- 441,455 ----
          ret = []
          for dotted, asname in names:
!             modnameConst = jast.StringConstant(".".join(dotted))
              if asname:
!                 code = jast.InvokeStatic("org.python.core.imp","importOneAs",
!                                          [modnameConst, self.frame.frame])
!                 code = self.get_module(dotted,0).makeReference(code)
!                 ret.append(self.set_name(asname,code))
              else:
!                 code = jast.InvokeStatic("org.python.core.imp","importOne",
!                                          [modnameConst, self.frame.frame])
!                 code = self.get_module(dotted,1).makeReference(code)
!             	ret.append(self.set_name(dotted[0],code))
          return ret

[Jython-checkins] CVS: jython/org/python/core imp.java,2.52,2.53

From: Finn B. <bc...@us...> - 2001-07-29 14:59:16

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

Modified Files:
	imp.java 
Log Message:
Patch [ #444911 ] which fixes bug #444292 local var binding overrides fix



Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.52
retrieving revision 2.53
diff -C2 -d -r2.52 -r2.53
*** imp.java	2001/07/25 22:01:14	2.52
--- imp.java	2001/07/29 14:59:13	2.53
***************
*** 13,17 ****
  public class imp
  {
!     public static final int APIVersion = 8;
  
      private imp() { ; }
--- 13,17 ----
  public class imp
  {
!     public static final int APIVersion = 9;
  
      private imp() { ; }
***************
*** 620,635 ****
       * is executed.
       */
!     public static void importOne(String mod, PyFrame frame) {
          //System.out.println("importOne(" + mod + ")");
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.f_locals,
                                                   Py.EmptyTuple);
!         int dot = mod.indexOf('.');
          if (dot != -1) {
              mod = mod.substring(0, dot).intern();
!         }
          //System.err.println("mod: "+mod+", "+dot);
!         frame.setlocal(mod, module);
      }
  
--- 620,635 ----
       * is executed.
       */
!     public static PyObject importOne(String mod, PyFrame frame) {
          //System.out.println("importOne(" + mod + ")");
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.getf_locals(),
                                                   Py.EmptyTuple);
!         /*int dot = mod.indexOf('.');
          if (dot != -1) {
              mod = mod.substring(0, dot).intern();
!         }*/
          //System.err.println("mod: "+mod+", "+dot);
!         return module;
      }
  
***************
*** 638,648 ****
       * "import spam as foo" is executed.
       */
!     public static void importOneAs(String mod, String asname, PyFrame frame) {
          //System.out.println("importOne(" + mod + ")");
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.f_locals,
                                                   getStarArg());
!         frame.setlocal(asname, module);
      }
  
--- 638,649 ----
       * "import spam as foo" is executed.
       */
!     public static PyObject importOneAs(String mod, PyFrame frame) {
          //System.out.println("importOne(" + mod + ")");
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.getf_locals(),
                                                   getStarArg());
!         // frame.setlocal(asname, module);
!         return module;
      }
  
***************
*** 651,656 ****
       * "from spam.eggs import foo, bar" is executed.
       */
!     public static void importFrom(String mod, String[] names, PyFrame frame) {
!         importFromAs(mod, names, names, frame);
      }
  
--- 652,657 ----
       * "from spam.eggs import foo, bar" is executed.
       */
!     public static PyObject[] importFrom(String mod, String[] names, PyFrame frame) {
!         return importFromAs(mod, names, null, frame);
      }
  
***************
*** 659,663 ****
       * "from spam.eggs import foo as spam" is executed.
       */
!     public static void importFromAs(String mod, String[] names,
                                      String[] asnames, PyFrame frame)
      {
--- 660,664 ----
       * "from spam.eggs import foo as spam" is executed.
       */
!     public static PyObject[] importFromAs(String mod, String[] names,
                                      String[] asnames, PyFrame frame)
      {
***************
*** 673,684 ****
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.f_locals,
                                                   new PyTuple(pynames));
          for (int i=0; i<names.length; i++) {
              PyObject submod = module.__findattr__(names[i]);
              if (submod == null)
                  throw Py.ImportError("cannot import name " + names[i]);
!             frame.setlocal(asnames[i], submod);
          }
      }
  
--- 674,687 ----
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.getf_locals(),
                                                   new PyTuple(pynames));
+         PyObject[] submods = new PyObject[names.length];
          for (int i=0; i<names.length; i++) {
              PyObject submod = module.__findattr__(names[i]);
              if (submod == null)
                  throw Py.ImportError("cannot import name " + names[i]);
!             submods[i] = submod;
          }
+         return submods;
      }
  
***************
*** 699,703 ****
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.f_locals,
                                                   getStarArg());
          PyObject names;
--- 702,706 ----
          PyObject module = __builtin__.__import__(mod,
                                                   frame.f_globals,
!                                                  frame.getf_locals(),
                                                   getStarArg());
          PyObject names;

138 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 240 241 242 243 244 .. 267 > >> (Page 242 of 267)