Screenshot instructions:
Windows
Mac
Red Hat Linux
Ubuntu
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)
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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
|
2
|
3
|
4
|
5
|
6
(5) |
|
7
|
8
|
9
|
10
|
11
|
12
|
13
|
|
14
|
15
|
16
|
17
|
18
|
19
(1) |
20
|
|
21
(1) |
22
|
23
(1) |
24
|
25
|
26
|
27
(9) |
|
28
(13) |
29
|
30
(6) |
31
|
|
|
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-30 20:37:37
|
Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv26174
Modified Files:
PythonGrammar.java PythonGrammarConstants.java
PythonGrammarTokenManager.java
Log Message:
Commiting generated files.
Fix for "[ #475445 ] incompatibility with python".
Explicit ignore newlines in single-line-comments and make a special
case for trailing comments where the newline isn't ignored.
Index: PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -d -r2.13 -r2.14
*** PythonGrammar.java 2001/07/20 13:43:03 2.13
--- PythonGrammar.java 2001/10/30 20:37:33 2.14
***************
*** 55,59 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
simple_stmt();
break;
--- 55,59 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
simple_stmt();
break;
***************
*** 147,151 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
;
break;
--- 147,151 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
;
break;
***************
*** 194,198 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
stmt();
break;
--- 194,198 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
stmt();
break;
***************
*** 644,648 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
simple_stmt();
break;
--- 644,648 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
simple_stmt();
break;
***************
*** 707,711 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
expr_stmt();
break;
--- 707,711 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
expr_stmt();
break;
***************
*** 1349,1353 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
SmartTestList();
break;
--- 1349,1353 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
SmartTestList();
break;
***************
*** 1406,1410 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
test();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
--- 1406,1410 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
test();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
***************
*** 2134,2138 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
test();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
--- 2134,2138 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
test();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
***************
*** 2211,2215 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
simple_stmt();
break;
--- 2211,2215 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
simple_stmt();
break;
***************
*** 2257,2261 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
;
break;
--- 2257,2261 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
;
break;
***************
*** 2317,2321 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
and_test();
label_16:
--- 2317,2321 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
and_test();
label_16:
***************
*** 2456,2460 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
comparison();
break;
--- 2456,2460 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
comparison();
break;
***************
*** 3194,3198 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
power();
break;
--- 3194,3198 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
power();
break;
***************
*** 3394,3398 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
SmartTestList();
break;
--- 3394,3398 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
SmartTestList();
break;
***************
*** 3429,3433 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
listmaker();
break;
--- 3429,3433 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
listmaker();
break;
***************
*** 3484,3488 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
dictmaker();
break;
--- 3484,3488 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
dictmaker();
break;
***************
*** 3513,3518 ****
}
break;
! case 112:
! jj_consume_token(112);
SmartTestList();
SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP);
--- 3513,3518 ----
}
break;
! case 113:
! jj_consume_token(113);
SmartTestList();
SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP);
***************
*** 3521,3525 ****
jjtreeOpenNodeScope(jjtn004);
try {
! jj_consume_token(112);
} finally {
if (jjtc004) {
--- 3521,3525 ----
jjtreeOpenNodeScope(jjtn004);
try {
! jj_consume_token(113);
} finally {
if (jjtc004) {
***************
*** 3723,3727 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
SimpleNode jjtn002 = new SimpleNode(JJTSLICE);
boolean jjtc002 = true;
--- 3723,3727 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
SimpleNode jjtn002 = new SimpleNode(JJTSLICE);
boolean jjtc002 = true;
***************
*** 3816,3820 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
test();
break;
--- 3816,3820 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
test();
break;
***************
*** 3845,3849 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
test();
break;
--- 3845,3849 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
test();
break;
***************
*** 4308,4312 ****
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 112:
normalargs();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
--- 4308,4312 ----
case TRIPLE_STRING:
case TRIPLE_STRING2:
! case 113:
normalargs();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
***************
*** 5463,5478 ****
}
- final private boolean jj_3_22() {
- if (jj_3R_44()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
- final private boolean jj_3_21() {
- if (jj_3R_44()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- return false;
- }
-
final private boolean jj_3_20() {
if (jj_scan_token(COMMA)) return true;
--- 5463,5466 ----
***************
*** 5700,5704 ****
final private boolean jj_3R_139() {
! if (jj_scan_token(112)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
--- 5688,5692 ----
final private boolean jj_3R_139() {
! if (jj_scan_token(113)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
***************
*** 6599,6602 ****
--- 6587,6602 ----
}
+ final private boolean jj_3_22() {
+ if (jj_3R_44()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
+ final private boolean jj_3_21() {
+ if (jj_3R_44()) return true;
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ return false;
+ }
+
public PythonGrammarTokenManager token_source;
public Token token, jj_nt;
***************
*** 6608,6615 ****
private int jj_gen;
final private int[] jj_la1 = new int[104];
! final private int[] jj_la1_0 = {0x182a0040,0x182a0040,0x182a0040,0x40,0xa0020000,0x1000000,0x1000000,0xa0000000,0xa0020000,0xa0000000,0x0,0x20000,0x1000000,0x182a0000,0x800000,0x182a0000,0x0,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x182a0000,0x1000000,0x1000000,0x182a0000,0x0,0x1000000,0x1000000,0x20000000,0x0,0x2000000,0x0,0x1000000,0x1000000,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x182a0000,0x182a0000,0x182a0040,0x0,0x182a0000,0x0,0x182a0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0x60000000,0x60000000,0x182a0000,0x2220000,0x20000,0x2220000,0x182a0000,0x182a0000,0x182a0000,0x0,0x2a0000,0xa0020000,0x1000000,0x4000000,0x1e2a0000,0x182a0000,0x182a0000,0x4000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x0,0x0,0x20000,0x1000000,0xa0000000,0xa0000000,0x1000000,0x1000000,0xa0000000,0xa0000000,0x182a0000,0xa0000000,0x0,0x0,0x0,0x0,};
! final private int[] jj_la1_1 = {0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x90000008,0x0,0x90000008,0x80,0x3ff8000,0x0,0x0,0x0,0x0,0x0,0x90000008,0x0,0x0,0x90000008,0x0,0x0,0x0,0xfc000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x4000000,0x90000008,0x8000000,0x10000008,0x70007f00,0x50007f00,0x20000000,0x20,0x10,0x40,0x3,0x3,0x0,0x0,0x4,0x4,0x8,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfc000008,0x0,0x0,0x0,0x0,0xfc000000,};
! final private int[] jj_la1_2 = {0x1efffdb9,0x1efffdb9,0x1efffdb9,0x0,0xc00000,0x0,0x0,0x0,0xc00000,0x0,0x0,0xc00000,0x0,0x1efffdb9,0x0,0x1efffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1ec00000,0x0,0x0,0x1ec00000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1ec00000,0x1efffdb9,0x1efffc00,0x0,0x1ec00000,0x0,0x1ec00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ec00000,0x0,0x0,0x0,0x1ec00000,0x1ec00000,0x1ec00000,0x0,0x1ec00000,0xc00000,0x0,0x0,0x1ec00000,0x1ec00000,0x1ec00000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,0xc00000,0x0,0xffffff,};
! final private int[] jj_la1_3 = {0x10078,0x10078,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x0,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x10078,0x10078,0x0,0x10078,0x0,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x0,0x0,0x10078,0x10078,0x10078,0x78,0x10078,0x0,0x0,0x0,0x10078,0x10078,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x0,0x0,0x78,0x0,};
final private JJCalls[] jj_2_rtns = new JJCalls[24];
private boolean jj_rescan = false;
--- 6608,6615 ----
private int jj_gen;
final private int[] jj_la1 = new int[104];
! final private int[] jj_la1_0 = {0x30540040,0x30540040,0x30540040,0x40,0x40040000,0x2000000,0x2000000,0x40000000,0x40040000,0x40000000,0x0,0x40000,0x2000000,0x30540000,0x1000000,0x30540000,0x0,0x0,0x2000000,0x2000000,0x2000000,0x0,0x0,0x30540000,0x2000000,0x2000000,0x30540000,0x0,0x2000000,0x2000000,0x40000000,0x0,0x4000000,0x0,0x2000000,0x2000000,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x30540000,0x30540000,0x30540040,0x0,0x30540000,0x0,0x30540000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30000000,0x30000000,0xc0000000,0xc0000000,0x30540000,0x4440000,0x40000,0x4440000,0x30540000,0x30540000,0x30540000,0x0,0x540000,0x40040000,0x2000000,0x8000000,0x3c540000,0x30540000,0x30540000,0x8000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x0,0x0,0x0,0x40000,0x2000000,0x40000000,0x40000000,0x2000000,0x2000000,0x40000000,0x40000000,0x30540000,0x40000000,0x0,0x0,0x0,0x0,};
! final private int[] jj_la1_1 = {0x20000010,0x20000010,0x20000010,0x0,0x1,0x0,0x0,0x1,0x1,0x1,0x100,0x0,0x0,0x20000010,0x0,0x20000010,0x100,0x7ff0000,0x0,0x0,0x0,0x0,0x0,0x20000010,0x0,0x0,0x20000010,0x0,0x0,0x0,0xf8000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000010,0x20000010,0x20000010,0x8000000,0x20000010,0x10000000,0x20000010,0xe000fe00,0xa000fe00,0x40000000,0x40,0x20,0x80,0x6,0x6,0x0,0x0,0x8,0x8,0x10,0x0,0x0,0x0,0x20000010,0x20000010,0x20000010,0x0,0x0,0x1,0x0,0x0,0x20000010,0x20000010,0x20000010,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x1,0x1,0xf8000010,0x1,0x0,0x0,0x0,0xf8000000,};
! final private int[] jj_la1_2 = {0x3dfffb73,0x3dfffb73,0x3dfffb73,0x0,0x1800000,0x0,0x0,0x0,0x1800000,0x0,0x0,0x1800000,0x0,0x3dfffb73,0x0,0x3dfff801,0x0,0x0,0x0,0x0,0x0,0x800,0x8e000,0x3d800001,0x0,0x0,0x3d800001,0x30000,0x0,0x0,0x1ffffff,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x372,0x8,0x4,0x4,0x4,0x80,0x4,0x480,0x0,0x3d800001,0x3dfffb73,0x3dfff801,0x0,0x3d800001,0x0,0x3d800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3d800000,0x0,0x0,0x0,0x3d800001,0x3d800001,0x3d800001,0x0,0x3d800000,0x1800000,0x0,0x0,0x3d800001,0x3d800001,0x3d800001,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x22,0x22,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3dffffff,0x0,0x3c000000,0x1800000,0x0,0x1ffffff,};
! final private int[] jj_la1_3 = {0x200f0,0x200f0,0x200f0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200f0,0x0,0x200f0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200f0,0x0,0x0,0x200f0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200f0,0x200f0,0x200f0,0x0,0x200f0,0x0,0x200f0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200f0,0x0,0x0,0x0,0x200f0,0x200f0,0x200f0,0xf0,0x200f0,0x0,0x0,0x0,0x200f0,0x200f0,0x200f0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200f0,0x0,0x0,0x0,0xf0,0x0,};
final private JJCalls[] jj_2_rtns = new JJCalls[24];
private boolean jj_rescan = false;
***************
*** 6757,6762 ****
final public ParseException generateParseException() {
jj_expentries.removeAllElements();
! boolean[] la1tokens = new boolean[113];
! for (int i = 0; i < 113; i++) {
la1tokens[i] = false;
}
--- 6757,6762 ----
final public ParseException generateParseException() {
jj_expentries.removeAllElements();
! boolean[] la1tokens = new boolean[114];
! for (int i = 0; i < 114; i++) {
la1tokens[i] = false;
}
***************
*** 6783,6787 ****
}
}
! for (int i = 0; i < 113; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
--- 6783,6787 ----
}
}
! for (int i = 0; i < 114; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
Index: PythonGrammarConstants.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarConstants.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** PythonGrammarConstants.java 2001/04/25 18:56:18 2.6
--- PythonGrammarConstants.java 2001/10/30 20:37:33 2.7
***************
*** 14,100 ****
int DEDENT = 14;
int INDENT = 15;
! int SINGLE_LINE_COMMENT = 16;
! int LPAREN = 17;
! int RPAREN = 18;
! int LBRACE = 19;
! int RBRACE = 20;
! int LBRACKET = 21;
! int RBRACKET = 22;
! int SEMICOLON = 23;
! int COMMA = 24;
! int DOT = 25;
! int COLON = 26;
! int PLUS = 27;
! int MINUS = 28;
! int MULTIPLY = 29;
! int DIVIDE = 30;
! int POWER = 31;
! int LSHIFT = 32;
! int RSHIFT = 33;
! int MODULO = 34;
! int NOT = 35;
! int XOR = 36;
! int OR = 37;
! int AND = 38;
! int EQUAL = 39;
! int GREATER = 40;
! int LESS = 41;
! int EQEQUAL = 42;
! int EQLESS = 43;
! int EQGREATER = 44;
! int LESSGREATER = 45;
! int NOTEQUAL = 46;
! int PLUSEQ = 47;
! int MINUSEQ = 48;
! int MULTIPLYEQ = 49;
! int DIVIDEEQ = 50;
! int MODULOEQ = 51;
! int ANDEQ = 52;
! int OREQ = 53;
! int XOREQ = 54;
! int LSHIFTEQ = 55;
! int RSHIFTEQ = 56;
! int POWEREQ = 57;
! int OR_BOOL = 58;
! int AND_BOOL = 59;
! int NOT_BOOL = 60;
! int IS = 61;
! int IN = 62;
! int LAMBDA = 63;
! int IF = 64;
! int ELSE = 65;
! int ELIF = 66;
! int WHILE = 67;
! int FOR = 68;
! int TRY = 69;
! int EXCEPT = 70;
! int DEF = 71;
! int CLASS = 72;
! int FINALLY = 73;
! int PRINT = 74;
! int PASS = 75;
! int BREAK = 76;
! int CONTINUE = 77;
! int RETURN = 78;
! int IMPORT = 79;
! int FROM = 80;
! int DEL = 81;
! int RAISE = 82;
! int GLOBAL = 83;
! int EXEC = 84;
! int ASSERT = 85;
! int AS = 86;
! int NAME = 87;
! int LETTER = 88;
! int DECNUMBER = 89;
! int HEXNUMBER = 90;
! int OCTNUMBER = 91;
! int FLOAT = 92;
! int EXPONENT = 93;
! int DIGIT = 94;
! int SINGLE_STRING = 99;
! int SINGLE_STRING2 = 100;
! int TRIPLE_STRING = 101;
! int TRIPLE_STRING2 = 102;
int DEFAULT = 0;
--- 14,101 ----
int DEDENT = 14;
int INDENT = 15;
! int TRAILING_COMMENT = 16;
! int SINGLE_LINE_COMMENT = 17;
! int LPAREN = 18;
! int RPAREN = 19;
! int LBRACE = 20;
! int RBRACE = 21;
! int LBRACKET = 22;
! int RBRACKET = 23;
! int SEMICOLON = 24;
! int COMMA = 25;
! int DOT = 26;
! int COLON = 27;
! int PLUS = 28;
! int MINUS = 29;
! int MULTIPLY = 30;
! int DIVIDE = 31;
! int POWER = 32;
! int LSHIFT = 33;
! int RSHIFT = 34;
! int MODULO = 35;
! int NOT = 36;
! int XOR = 37;
! int OR = 38;
! int AND = 39;
! int EQUAL = 40;
! int GREATER = 41;
! int LESS = 42;
! int EQEQUAL = 43;
! int EQLESS = 44;
! int EQGREATER = 45;
! int LESSGREATER = 46;
! int NOTEQUAL = 47;
! int PLUSEQ = 48;
! int MINUSEQ = 49;
! int MULTIPLYEQ = 50;
! int DIVIDEEQ = 51;
! int MODULOEQ = 52;
! int ANDEQ = 53;
! int OREQ = 54;
! int XOREQ = 55;
! int LSHIFTEQ = 56;
! int RSHIFTEQ = 57;
! int POWEREQ = 58;
! int OR_BOOL = 59;
! int AND_BOOL = 60;
! int NOT_BOOL = 61;
! int IS = 62;
! int IN = 63;
! int LAMBDA = 64;
! int IF = 65;
! int ELSE = 66;
! int ELIF = 67;
! int WHILE = 68;
! int FOR = 69;
! int TRY = 70;
! int EXCEPT = 71;
! int DEF = 72;
! int CLASS = 73;
! int FINALLY = 74;
! int PRINT = 75;
! int PASS = 76;
! int BREAK = 77;
! int CONTINUE = 78;
! int RETURN = 79;
! int IMPORT = 80;
! int FROM = 81;
! int DEL = 82;
! int RAISE = 83;
! int GLOBAL = 84;
! int EXEC = 85;
! int ASSERT = 86;
! int AS = 87;
! int NAME = 88;
! int LETTER = 89;
! int DECNUMBER = 90;
! int HEXNUMBER = 91;
! int OCTNUMBER = 92;
! int FLOAT = 93;
! int EXPONENT = 94;
! int DIGIT = 95;
! int SINGLE_STRING = 100;
! int SINGLE_STRING2 = 101;
! int TRIPLE_STRING = 102;
! int TRIPLE_STRING2 = 103;
int DEFAULT = 0;
***************
*** 127,130 ****
--- 128,132 ----
"\"\"",
"\"<INDENT>\"",
+ "<TRAILING_COMMENT>",
"<SINGLE_LINE_COMMENT>",
"\"(\"",
***************
*** 206,213 ****
"<EXPONENT>",
"<DIGIT>",
- "<token of kind 95>",
"<token of kind 96>",
"<token of kind 97>",
"<token of kind 98>",
"\"\\\'\"",
"\"\\\"\"",
--- 208,215 ----
"<EXPONENT>",
"<DIGIT>",
"<token of kind 96>",
"<token of kind 97>",
"<token of kind 98>",
+ "<token of kind 99>",
"\"\\\'\"",
"\"\\\"\"",
***************
*** 215,226 ****
"\"\\\"\\\"\\\"\"",
"\"\\\\\\r\\n\"",
- "<token of kind 104>",
"<token of kind 105>",
"<token of kind 106>",
"\"\\r\\n\"",
"\"\\n\"",
"\"\\r\"",
- "<token of kind 110>",
"<token of kind 111>",
"\"`\"",
};
--- 217,228 ----
"\"\\\"\\\"\\\"\"",
"\"\\\\\\r\\n\"",
"<token of kind 105>",
"<token of kind 106>",
+ "<token of kind 107>",
"\"\\r\\n\"",
"\"\\n\"",
"\"\\r\"",
"<token of kind 111>",
+ "<token of kind 112>",
"\"`\"",
};
Index: PythonGrammarTokenManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -d -r2.12 -r2.13
*** PythonGrammarTokenManager.java 2001/07/21 09:16:12 2.12
--- PythonGrammarTokenManager.java 2001/10/30 20:37:33 2.13
***************
*** 52,67 ****
{
case 0:
! if ((active1 & 0x4000000000L) != 0L)
{
! jjmatchedKind = 110;
return -1;
}
return -1;
case 1:
! if ((active1 & 0x4000000000L) != 0L)
[...2586 lines suppressed...]
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
--- 2923,2927 ----
matchedToken.image = image.toString();
break;
! case 102 :
if (image == null)
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
***************
*** 2934,2938 ****
matchedToken.image = image.toString();
break;
! case 102 :
if (image == null)
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
--- 2930,2934 ----
matchedToken.image = image.toString();
break;
! case 103 :
if (image == null)
image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-30 20:30:13
|
Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv24051
Modified Files:
python.jjt
Log Message:
Fix for "[ #475445 ] incompatibility with python".
Explicit ignore newlines in single-line-comments and make a special
case for trailing comments where the newline isn't ignored.
Index: python.jjt
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/python.jjt,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** python.jjt 2001/07/21 09:15:24 2.15
--- python.jjt 2001/10/30 20:30:10 2.16
***************
*** 211,217 ****
! <DEFAULT, INDENTING, INDENTATION_UNCHANGED> SPECIAL_TOKEN: /* COMMENTS */
{
! <SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* > { indent = 0; }
}
--- 211,223 ----
! <DEFAULT> SPECIAL_TOKEN: /* COMMENTS */
{
! <TRAILING_COMMENT: "#" (~["\n","\r"])* >
! }
!
! <INDENTING, INDENTATION_UNCHANGED> SPECIAL_TOKEN: /* COMMENTS */
! {
! <SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* ("\r\n" | "\n" | "\r")>
! { indent = 0; }
}
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-30 20:16:27
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv20675
Added Files:
test329.py test329s1.py test329s2.py test329s3.py
Log Message:
Test for [ #475445 ] incompatibility with python
--- NEW FILE: test329.py ---
"""
[ #475445 ] incompatibility with python
Check comment handling when reading source from stdin.
"""
import support
support.runJava("org.python.util.jython -S < test329s1.py > test329.out")
support.runJava("org.python.util.jython -S < test329s2.py > test329.out")
support.runJava("org.python.util.jython -S < test329s3.py > test329.out")
--- NEW FILE: test329s1.py ---
import sys
for t in range(10):
# a comment
print t; sys.exit(0)
sys.exit(22)
--- NEW FILE: test329s2.py ---
import sys
for t in range(10):
# a comment
print t; sys.exit(0)
sys.exit(22)
--- NEW FILE: test329s3.py ---
import sys
for t in range(10):
a = 1 # a comment
print t; sys.exit(0)
sys.exit(22)
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-30 19:10:24
|
Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv3242
Modified Files:
PyBuiltinFunctionSet.java
Log Message:
Fix for "[ #462280 ] builtin method as a class variable".
Don't rebind a already bound PyBuiltinFunctionSet.
Index: PyBuiltinFunctionSet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyBuiltinFunctionSet.java,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -d -r2.12 -r2.13
*** PyBuiltinFunctionSet.java 2001/10/28 17:13:43 2.12
--- PyBuiltinFunctionSet.java 2001/10/30 19:10:21 2.13
***************
*** 59,63 ****
public PyObject _doget(PyObject container, PyObject wherefound) {
! if (isMethod) {
// TBD: is there a better way?
try {
--- 59,65 ----
public PyObject _doget(PyObject container, PyObject wherefound) {
! // Eventually we may want to allow rebinding of builtins
! // when container is a subclass of __self__.__class__.
! if (isMethod && __self__ == Py.None) {
// TBD: is there a better way?
try {
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-30 19:09:25
|
Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv1661
Modified Files:
PyInstance.java
Log Message:
Part of fix for "[ #462280 ] builtin method as a class variable".
I don't understand the reason for the code I removed with this change. If
there is a performance improvement hidden here, handling both the method
and the function aspect of PyBuiltinFunctionSet in the same way is surely
wrong.
Another hint of the strangeness is the invoke() with zero parameters
which does not check for PyBuiltinFunctionSet. At least now all 3
invoke() methods are working in a similar manner.
Index: PyInstance.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyInstance.java,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -d -r2.25 -r2.26
*** PyInstance.java 2001/10/28 17:13:43 2.25
--- PyInstance.java 2001/10/30 19:09:23 2.26
***************
*** 250,256 ****
f = ifindclass(name, false);
if (f != null) {
! if (f instanceof PyFunction ||
! f instanceof PyBuiltinFunctionSet)
! {
return f.__call__(this, arg1);
} else {
--- 250,254 ----
f = ifindclass(name, false);
if (f != null) {
! if (f instanceof PyFunction) {
return f.__call__(this, arg1);
} else {
***************
*** 269,275 ****
f = ifindclass(name, false);
if (f != null) {
! if (f instanceof PyFunction ||
! f instanceof PyBuiltinFunctionSet)
! {
return f.__call__(this, arg1, arg2);
} else {
--- 267,271 ----
f = ifindclass(name, false);
if (f != null) {
! if (f instanceof PyFunction) {
return f.__call__(this, arg1, arg2);
} else {
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-30 19:01:14
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv648
Added Files:
test328.py
Log Message:
Test for [ #462280 ] builtin method as a class variable
--- NEW FILE: test328.py ---
"""
[ #462280 ] builtin method as a class variable
"""
import support
class Foo:
mylistIndex = ['a', 'b', 'c', 'd', 'e'].index
a = Foo()
if a.mylistIndex.__self__ != ['a', 'b', 'c', 'd', 'e']:
raise support.TestError('Builtin func with wrong self')
assert a.mylistIndex('c') == 2
assert Foo.mylistIndex('c') == 2
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 17:14:15
|
Update of /cvsroot/jython/jython/org/python/compiler In directory usw-pr-cvs1:/tmp/cvs-serv23109/compiler Modified Files: APIVersion.java AdapterMaker.java ArgListCompiler.java Attribute.java ClassFile.java Code.java CodeCompiler.java Constant.java ConstantPool.java JavaMaker.java Label.java Module.java ProxyMaker.java SourceFile.java Log Message: Fix for "[ #457614 ] pls change ©right; to (c) in sources". Index: APIVersion.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/APIVersion.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** APIVersion.java 1999/05/17 19:55:09 2.1 --- APIVersion.java 2001/10/28 17:13:41 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: AdapterMaker.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/AdapterMaker.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** AdapterMaker.java 2000/10/19 18:10:28 2.4 --- AdapterMaker.java 2001/10/28 17:13:41 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: ArgListCompiler.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/ArgListCompiler.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** ArgListCompiler.java 2001/08/13 18:30:35 2.5 --- ArgListCompiler.java 2001/10/28 17:13:41 2.6 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: Attribute.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Attribute.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** Attribute.java 1999/05/17 19:55:09 2.1 --- Attribute.java 2001/10/28 17:13:41 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: ClassFile.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/ClassFile.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** ClassFile.java 1999/10/11 21:19:26 2.4 --- ClassFile.java 2001/10/28 17:13:41 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: Code.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Code.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** Code.java 2001/02/07 09:21:23 2.3 --- Code.java 2001/10/28 17:13:42 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: CodeCompiler.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/CodeCompiler.java,v retrieving revision 2.20 retrieving revision 2.21 diff -C2 -d -r2.20 -r2.21 *** CodeCompiler.java 2001/10/06 20:18:13 2.20 --- CodeCompiler.java 2001/10/28 17:13:42 2.21 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: Constant.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Constant.java,v retrieving revision 2.0 retrieving revision 2.1 diff -C2 -d -r2.0 -r2.1 *** Constant.java 1999/04/13 22:08:47 2.0 --- Constant.java 2001/10/28 17:13:42 2.1 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: ConstantPool.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/ConstantPool.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** ConstantPool.java 1999/05/17 19:55:09 2.3 --- ConstantPool.java 2001/10/28 17:13:42 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: JavaMaker.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/JavaMaker.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -d -r2.11 -r2.12 *** JavaMaker.java 2001/05/07 19:18:33 2.11 --- JavaMaker.java 2001/10/28 17:13:42 2.12 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: Label.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Label.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** Label.java 1999/05/17 19:55:09 2.1 --- Label.java 2001/10/28 17:13:42 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: Module.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Module.java,v retrieving revision 2.7 retrieving revision 2.8 diff -C2 -d -r2.7 -r2.8 *** Module.java 2001/05/27 18:49:15 2.7 --- Module.java 2001/10/28 17:13:42 2.8 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: ProxyMaker.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/ProxyMaker.java,v retrieving revision 2.13 retrieving revision 2.14 diff -C2 -d -r2.13 -r2.14 *** ProxyMaker.java 2001/06/30 01:01:28 2.13 --- ProxyMaker.java 2001/10/28 17:13:42 2.14 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; Index: SourceFile.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/SourceFile.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** SourceFile.java 1999/05/17 19:55:09 2.1 --- SourceFile.java 2001/10/28 17:13:42 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.compiler; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.compiler; |
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 17:13:47
|
Update of /cvsroot/jython/jython/org/python/parser In directory usw-pr-cvs1:/tmp/cvs-serv23109/parser Modified Files: SimpleNode.java Visitor.java Log Message: Fix for "[ #457614 ] pls change ©right; to (c) in sources". Index: SimpleNode.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/SimpleNode.java,v retrieving revision 2.15 retrieving revision 2.16 diff -C2 -d -r2.15 -r2.16 *** SimpleNode.java 2001/08/13 18:30:35 2.15 --- SimpleNode.java 2001/10/28 17:13:44 2.16 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.parser; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.parser; Index: Visitor.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/Visitor.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** Visitor.java 2000/10/18 13:01:10 2.4 --- Visitor.java 2001/10/28 17:13:44 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.parser; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.parser; |
Update of /cvsroot/jython/jython/org/python/core In directory usw-pr-cvs1:/tmp/cvs-serv23109/core Modified Files: BytecodeLoader.java BytecodeLoader1.java BytecodeLoader2.java CachedJarsPackageManager.java CollectionProxy.java CollectionProxy2.java ExtraMath.java InitModule.java MakeProxies.java Options.java PackageManager.java PathPackageManager.java Py.java PyArray.java PyBeanEvent.java PyBeanEventProperty.java PyBeanProperty.java PyBuiltinFunctionSet.java PyClass.java PyCode.java PyComplex.java PyCompoundCallable.java PyDictionary.java PyEllipsis.java PyException.java PyFile.java PyFinalizableInstance.java PyFloat.java PyFrame.java PyFunction.java PyFunctionTable.java PyInstance.java PyInteger.java PyJavaClass.java PyJavaInnerClass.java PyJavaInstance.java PyJavaPackage.java PyList.java PyLong.java PyMethod.java PyModule.java PyNone.java PyObject.java PyProxy.java PyReflectedConstructor.java PyReflectedField.java PyReflectedFunction.java PyRunnable.java PySequence.java PySingleton.java PySlice.java PyString.java PyStringMap.java PySyntaxError.java PySystemState.java PyTableCode.java PyTraceback.java PyTuple.java PyXRange.java PythonTraceFunction.java ReflectedArgs.java ReflectedCallData.java StderrWrapper.java StdoutWrapper.java SysPackageManager.java SyspathJavaLoader.java ThreadState.java TraceFunction.java __builtin__.java imp.java parser.java Log Message: Fix for "[ #457614 ] pls change ©right; to (c) in sources". Index: BytecodeLoader.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader.java,v retrieving revision 2.14 retrieving revision 2.15 diff -C2 -d -r2.14 -r2.15 *** BytecodeLoader.java 2001/03/04 18:04:31 2.14 --- BytecodeLoader.java 2001/10/28 17:13:42 2.15 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: BytecodeLoader1.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader1.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** BytecodeLoader1.java 2001/02/25 16:37:48 2.3 --- BytecodeLoader1.java 2001/10/28 17:13:42 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: BytecodeLoader2.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/BytecodeLoader2.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** BytecodeLoader2.java 2001/02/25 16:37:48 2.3 --- BytecodeLoader2.java 2001/10/28 17:13:42 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: CachedJarsPackageManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/CachedJarsPackageManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CachedJarsPackageManager.java 2001/07/23 16:10:42 1.9 --- CachedJarsPackageManager.java 2001/10/28 17:13:42 1.10 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni Index: CollectionProxy.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/CollectionProxy.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** CollectionProxy.java 2001/02/25 16:38:31 2.4 --- CollectionProxy.java 2001/10/28 17:13:42 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: CollectionProxy2.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/CollectionProxy2.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** CollectionProxy2.java 2001/02/25 16:38:31 2.3 --- CollectionProxy2.java 2001/10/28 17:13:42 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives /* Support for java-1.2 collections --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives /* Support for java-1.2 collections Index: ExtraMath.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/ExtraMath.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** ExtraMath.java 2001/02/25 16:38:45 2.2 --- ExtraMath.java 2001/10/28 17:13:42 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: InitModule.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/InitModule.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** InitModule.java 2001/02/25 16:39:00 2.2 --- InitModule.java 2001/10/28 17:13:42 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: MakeProxies.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/MakeProxies.java,v retrieving revision 2.17 retrieving revision 2.18 diff -C2 -d -r2.17 -r2.18 *** MakeProxies.java 2001/10/19 00:16:45 2.17 --- MakeProxies.java 2001/10/28 17:13:42 2.18 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: Options.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/Options.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -d -r2.8 -r2.9 *** Options.java 2001/06/04 10:42:59 2.8 --- Options.java 2001/10/28 17:13:42 2.9 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PackageManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PackageManager.java,v retrieving revision 2.9 retrieving revision 2.10 diff -C2 -d -r2.9 -r2.10 *** PackageManager.java 2001/07/25 19:58:07 2.9 --- PackageManager.java 2001/10/28 17:13:42 2.10 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni Index: PathPackageManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PathPackageManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PathPackageManager.java 2001/02/02 09:28:36 1.4 --- PathPackageManager.java 2001/10/28 17:13:42 1.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni Index: Py.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v retrieving revision 2.50 retrieving revision 2.51 diff -C2 -d -r2.50 -r2.51 *** Py.java 2001/07/25 18:48:43 2.50 --- Py.java 2001/10/28 17:13:42 2.51 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyArray.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyArray.java,v retrieving revision 2.6 retrieving revision 2.7 diff -C2 -d -r2.6 -r2.7 *** PyArray.java 2001/03/14 14:31:00 2.6 --- PyArray.java 2001/10/28 17:13:43 2.7 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.Array; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.Array; Index: PyBeanEvent.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyBeanEvent.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** PyBeanEvent.java 1999/05/17 19:59:37 2.1 --- PyBeanEvent.java 2001/10/28 17:13:43 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.*; Index: PyBeanEventProperty.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyBeanEventProperty.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** PyBeanEventProperty.java 2001/02/02 09:28:36 2.5 --- PyBeanEventProperty.java 2001/10/28 17:13:43 2.6 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyBeanProperty.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyBeanProperty.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** PyBeanProperty.java 2001/02/01 16:41:10 2.3 --- PyBeanProperty.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.*; Index: PyBuiltinFunctionSet.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyBuiltinFunctionSet.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -d -r2.11 -r2.12 *** PyBuiltinFunctionSet.java 2001/02/25 16:42:34 2.11 --- PyBuiltinFunctionSet.java 2001/10/28 17:13:43 2.12 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyClass.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyClass.java,v retrieving revision 2.25 retrieving revision 2.26 diff -C2 -d -r2.25 -r2.26 *** PyClass.java 2001/05/07 19:15:56 2.25 --- PyClass.java 2001/10/28 17:13:43 2.26 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.util.Vector; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.util.Vector; Index: PyCode.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyCode.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** PyCode.java 2001/03/08 23:43:51 2.5 --- PyCode.java 2001/10/28 17:13:43 2.6 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyComplex.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyComplex.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -d -r2.8 -r2.9 *** PyComplex.java 2001/08/19 21:21:40 2.8 --- PyComplex.java 2001/10/28 17:13:43 2.9 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyCompoundCallable.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyCompoundCallable.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** PyCompoundCallable.java 1999/05/17 19:59:38 2.1 --- PyCompoundCallable.java 2001/10/28 17:13:43 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.util.Vector; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.util.Vector; Index: PyDictionary.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyDictionary.java,v retrieving revision 2.16 retrieving revision 2.17 diff -C2 -d -r2.16 -r2.17 *** PyDictionary.java 2001/08/19 21:21:40 2.16 --- PyDictionary.java 2001/10/28 17:13:43 2.17 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyEllipsis.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyEllipsis.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** PyEllipsis.java 2001/02/25 16:45:09 2.2 --- PyEllipsis.java 2001/10/28 17:13:43 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyException.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyException.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** PyException.java 2001/03/04 18:04:31 2.5 --- PyException.java 2001/10/28 17:13:43 2.6 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.io.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.io.*; Index: PyFile.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyFile.java,v retrieving revision 2.21 retrieving revision 2.22 diff -C2 -d -r2.21 -r2.22 *** PyFile.java 2001/07/16 11:35:34 2.21 --- PyFile.java 2001/10/28 17:13:43 2.22 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyFinalizableInstance.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyFinalizableInstance.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** PyFinalizableInstance.java 2001/02/25 16:47:44 2.3 --- PyFinalizableInstance.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright =A9 Corporation for National Research Initiatives // These are just like normal instances, except that their classes included // a definition for __del__(), i.e. Python's finalizer. These two instance --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // These are just like normal instances, except that their classes included // a definition for __del__(), i.e. Python's finalizer. These two instance Index: PyFloat.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyFloat.java,v retrieving revision 2.9 retrieving revision 2.10 diff -C2 -d -r2.9 -r2.10 *** PyFloat.java 2001/08/19 21:21:40 2.9 --- PyFloat.java 2001/10/28 17:13:43 2.10 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyFrame.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyFrame.java,v retrieving revision 2.10 retrieving revision 2.11 diff -C2 -d -r2.10 -r2.11 *** PyFrame.java 2001/05/27 18:49:15 2.10 --- PyFrame.java 2001/10/28 17:13:43 2.11 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyFunction.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyFunction.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -d -r2.11 -r2.12 *** PyFunction.java 2001/03/08 23:43:51 2.11 --- PyFunction.java 2001/10/28 17:13:43 2.12 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyFunctionTable.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyFunctionTable.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** PyFunctionTable.java 2001/02/25 16:47:44 2.1 --- PyFunctionTable.java 2001/10/28 17:13:43 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyInstance.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyInstance.java,v retrieving revision 2.24 retrieving revision 2.25 diff -C2 -d -r2.24 -r2.25 *** PyInstance.java 2001/10/28 16:17:12 2.24 --- PyInstance.java 2001/10/28 17:13:43 2.25 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.util.Hashtable; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.util.Hashtable; Index: PyInteger.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyInteger.java,v retrieving revision 2.12 retrieving revision 2.13 diff -C2 -d -r2.12 -r2.13 *** PyInteger.java 2001/08/19 21:21:40 2.12 --- PyInteger.java 2001/10/28 17:13:43 2.13 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyJavaClass.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v retrieving revision 2.38 retrieving revision 2.39 diff -C2 -d -r2.38 -r2.39 *** PyJavaClass.java 2001/08/19 19:57:45 2.38 --- PyJavaClass.java 2001/10/28 17:13:43 2.39 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyJavaInnerClass.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaInnerClass.java,v retrieving revision 2.9 retrieving revision 2.10 diff -C2 -d -r2.9 -r2.10 *** PyJavaInnerClass.java 2001/08/19 19:57:45 2.9 --- PyJavaInnerClass.java 2001/10/28 17:13:43 2.10 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyJavaInstance.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaInstance.java,v retrieving revision 2.6 retrieving revision 2.7 diff -C2 -d -r2.6 -r2.7 *** PyJavaInstance.java 2001/07/18 15:53:56 2.6 --- PyJavaInstance.java 2001/10/28 17:13:43 2.7 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.Modifier; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.lang.reflect.Modifier; Index: PyJavaPackage.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaPackage.java,v retrieving revision 2.15 retrieving revision 2.16 diff -C2 -d -r2.15 -r2.16 *** PyJavaPackage.java 2001/07/23 16:10:42 2.15 --- PyJavaPackage.java 2001/10/28 17:13:43 2.16 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni Index: PyList.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyList.java,v retrieving revision 2.23 retrieving revision 2.24 diff -C2 -d -r2.23 -r2.24 *** PyList.java 2001/08/19 21:21:40 2.23 --- PyList.java 2001/10/28 17:13:43 2.24 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Implementation of the standard Python list objects --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Implementation of the standard Python list objects Index: PyLong.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyLong.java,v retrieving revision 2.12 retrieving revision 2.13 diff -C2 -d -r2.12 -r2.13 *** PyLong.java 2001/03/04 18:04:31 2.12 --- PyLong.java 2001/10/28 17:13:43 2.13 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyMethod.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyMethod.java,v retrieving revision 2.14 retrieving revision 2.15 diff -C2 -d -r2.14 -r2.15 *** PyMethod.java 2001/08/19 21:21:40 2.14 --- PyMethod.java 2001/10/28 17:13:43 2.15 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyModule.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyModule.java,v retrieving revision 2.12 retrieving revision 2.13 diff -C2 -d -r2.12 -r2.13 *** PyModule.java 2001/07/18 15:53:56 2.12 --- PyModule.java 2001/10/28 17:13:43 2.13 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyNone.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyNone.java,v retrieving revision 2.6 retrieving revision 2.7 diff -C2 -d -r2.6 -r2.7 *** PyNone.java 2001/08/19 21:21:40 2.6 --- PyNone.java 2001/10/28 17:13:43 2.7 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyObject.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyObject.java,v retrieving revision 2.25 retrieving revision 2.26 diff -C2 -d -r2.25 -r2.26 *** PyObject.java 2001/08/19 15:24:56 2.25 --- PyObject.java 2001/10/28 17:13:43 2.26 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyProxy.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyProxy.java,v retrieving revision 2.7 retrieving revision 2.8 diff -C2 -d -r2.7 -r2.8 *** PyProxy.java 2001/03/04 18:04:31 2.7 --- PyProxy.java 2001/10/28 17:13:43 2.8 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyReflectedConstructor.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyReflectedConstructor.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -d -r2.8 -r2.9 *** PyReflectedConstructor.java 2001/02/02 09:28:37 2.8 --- PyReflectedConstructor.java 2001/10/28 17:13:43 2.9 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyReflectedField.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyReflectedField.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** PyReflectedField.java 2001/02/01 16:41:11 2.3 --- PyReflectedField.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyReflectedFunction.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyReflectedFunction.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -d -r2.8 -r2.9 *** PyReflectedFunction.java 2001/02/23 20:27:05 2.8 --- PyReflectedFunction.java 2001/10/28 17:13:43 2.9 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyRunnable.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyRunnable.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** PyRunnable.java 2001/02/25 16:51:51 2.1 --- PyRunnable.java 2001/10/28 17:13:43 2.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PySequence.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PySequence.java,v retrieving revision 2.17 retrieving revision 2.18 diff -C2 -d -r2.17 -r2.18 *** PySequence.java 2001/03/04 18:12:33 2.17 --- PySequence.java 2001/10/28 17:13:43 2.18 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PySingleton.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PySingleton.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** PySingleton.java 1999/10/04 20:44:28 2.2 --- PySingleton.java 2001/10/28 17:13:43 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PySlice.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PySlice.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** PySlice.java 2001/07/18 15:53:56 2.4 --- PySlice.java 2001/10/28 17:13:43 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyString.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v retrieving revision 2.49 retrieving revision 2.50 diff -C2 -d -r2.49 -r2.50 *** PyString.java 2001/08/19 21:21:40 2.49 --- PyString.java 2001/10/28 17:13:43 2.50 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyStringMap.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyStringMap.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -d -r2.11 -r2.12 *** PyStringMap.java 2001/03/04 18:08:59 2.11 --- PyStringMap.java 2001/10/28 17:13:43 2.12 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PySyntaxError.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PySyntaxError.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** PySyntaxError.java 2001/02/25 16:45:59 2.3 --- PySyntaxError.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PySystemState.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v retrieving revision 2.62 retrieving revision 2.63 diff -C2 -d -r2.62 -r2.63 *** PySystemState.java 2001/08/19 21:21:40 2.62 --- PySystemState.java 2001/10/28 17:13:43 2.63 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // This class implements the standard Python sys module. --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // This class implements the standard Python sys module. Index: PyTableCode.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyTableCode.java,v retrieving revision 2.15 retrieving revision 2.16 diff -C2 -d -r2.15 -r2.16 *** PyTableCode.java 2001/08/14 19:33:55 2.15 --- PyTableCode.java 2001/10/28 17:13:43 2.16 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyTraceback.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyTraceback.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** PyTraceback.java 2001/02/25 16:51:51 2.3 --- PyTraceback.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyTuple.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyTuple.java,v retrieving revision 2.10 retrieving revision 2.11 diff -C2 -d -r2.10 -r2.11 *** PyTuple.java 2001/08/19 21:21:40 2.10 --- PyTuple.java 2001/10/28 17:13:43 2.11 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PyXRange.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyXRange.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** PyXRange.java 2001/03/05 19:56:18 2.3 --- PyXRange.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: PythonTraceFunction.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PythonTraceFunction.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** PythonTraceFunction.java 2000/10/11 10:12:24 2.2 --- PythonTraceFunction.java 2001/10/28 17:13:43 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: ReflectedArgs.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/ReflectedArgs.java,v retrieving revision 2.6 retrieving revision 2.7 diff -C2 -d -r2.6 -r2.7 *** ReflectedArgs.java 2001/02/02 09:28:37 2.6 --- ReflectedArgs.java 2001/10/28 17:13:43 2.7 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: ReflectedCallData.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/ReflectedCallData.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** ReflectedCallData.java 2001/02/01 16:41:11 2.3 --- ReflectedCallData.java 2001/10/28 17:13:43 2.4 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: StderrWrapper.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/StderrWrapper.java,v retrieving revision 2.0 retrieving revision 2.1 diff -C2 -d -r2.0 -r2.1 *** StderrWrapper.java 1999/04/14 19:35:28 2.0 --- StderrWrapper.java 2001/10/28 17:13:43 2.1 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: StdoutWrapper.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/StdoutWrapper.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** StdoutWrapper.java 2001/02/01 16:41:11 2.5 --- StdoutWrapper.java 2001/10/28 17:13:43 2.6 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: SysPackageManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/SysPackageManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SysPackageManager.java 2001/07/25 19:58:07 1.8 --- SysPackageManager.java 2001/10/28 17:13:43 1.9 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni Index: SyspathJavaLoader.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/SyspathJavaLoader.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** SyspathJavaLoader.java 2001/07/25 19:58:07 2.4 --- SyspathJavaLoader.java 2001/10/28 17:13:43 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives // Copyright 2000 Samuele Pedroni Index: ThreadState.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/ThreadState.java,v retrieving revision 2.4 retrieving revision 2.5 diff -C2 -d -r2.4 -r2.5 *** ThreadState.java 2001/02/01 16:41:11 2.4 --- ThreadState.java 2001/10/28 17:13:43 2.5 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; import java.util.Stack; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; import java.util.Stack; Index: TraceFunction.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/TraceFunction.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** TraceFunction.java 1999/09/08 22:15:34 2.2 --- TraceFunction.java 2001/10/28 17:13:43 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: __builtin__.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v retrieving revision 2.36 retrieving revision 2.37 diff -C2 -d -r2.36 -r2.37 *** __builtin__.java 2001/08/08 18:15:38 2.36 --- __builtin__.java 2001/10/28 17:13:43 2.37 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: imp.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v retrieving revision 2.53 retrieving revision 2.54 diff -C2 -d -r2.53 -r2.54 *** imp.java 2001/07/29 14:59:13 2.53 --- imp.java 2001/10/28 17:13:43 2.54 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; Index: parser.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/parser.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -d -r2.11 -r2.12 *** parser.java 2001/07/25 18:48:43 2.11 --- parser.java 2001/10/28 17:13:44 2.12 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.core; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.core; |
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 17:13:47
|
Update of /cvsroot/jython/jython/org/python/util In directory usw-pr-cvs1:/tmp/cvs-serv23109/util Modified Files: InteractiveConsole.java InteractiveInterpreter.java PythonInterpreter.java ReadlineConsole.java jython.java Log Message: Fix for "[ #457614 ] pls change ©right; to (c) in sources". Index: InteractiveConsole.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/util/InteractiveConsole.java,v retrieving revision 2.7 retrieving revision 2.8 diff -C2 -d -r2.7 -r2.8 *** InteractiveConsole.java 2000/12/06 21:00:51 2.7 --- InteractiveConsole.java 2001/10/28 17:13:44 2.8 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.util; import org.python.core.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.util; import org.python.core.*; Index: InteractiveInterpreter.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/util/InteractiveInterpreter.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -d -r2.5 -r2.6 *** InteractiveInterpreter.java 2001/07/18 15:53:56 2.5 --- InteractiveInterpreter.java 2001/10/28 17:13:44 2.6 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.util; import org.python.core.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.util; import org.python.core.*; Index: PythonInterpreter.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/util/PythonInterpreter.java,v retrieving revision 2.7 retrieving revision 2.8 diff -C2 -d -r2.7 -r2.8 *** PythonInterpreter.java 2001/05/27 18:49:15 2.7 --- PythonInterpreter.java 2001/10/28 17:13:44 2.8 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.util; import org.python.core.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.util; import org.python.core.*; Index: ReadlineConsole.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/util/ReadlineConsole.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReadlineConsole.java 2001/03/27 17:38:44 1.1 --- ReadlineConsole.java 2001/10/28 17:13:44 1.2 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.util; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.util; Index: jython.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/util/jython.java,v retrieving revision 2.19 retrieving revision 2.20 diff -C2 -d -r2.19 -r2.20 *** jython.java 2001/07/25 18:48:43 2.19 --- jython.java 2001/10/28 17:13:44 2.20 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.util; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.util; |
Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv23109/modules
Modified Files:
MD5Module.java MD5Object.java MatchObject.java PyLock.java
RegexObject.java SHA1.java Setup.java binascii.java
cPickle.java cStringIO.java codeop.java jarray.java math.java
operator.java os.java py_compile.java re.java sha.java
synchronize.java thread.java time.java types.java
Log Message:
Fix for "[ #457614 ] pls change ©right; to (c) in sources".
Index: MD5Module.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/MD5Module.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** MD5Module.java 2001/03/13 20:26:28 2.8
--- MD5Module.java 2001/10/28 17:13:44 2.9
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
// This is a JPython module wrapper around Harry Mantakos' md.java class,
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
// This is a JPython module wrapper around Harry Mantakos' md.java class,
Index: MD5Object.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/MD5Object.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** MD5Object.java 2001/02/02 11:29:42 2.4
--- MD5Object.java 2001/10/28 17:13:44 2.5
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: MatchObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/MatchObject.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** MatchObject.java 2001/02/02 11:29:42 2.8
--- MatchObject.java 2001/10/28 17:13:44 2.9
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: PyLock.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/PyLock.java,v
retrieving revision 2.0
retrieving revision 2.1
diff -C2 -d -r2.0 -r2.1
*** PyLock.java 1999/04/14 19:45:56 2.0
--- PyLock.java 2001/10/28 17:13:44 2.1
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: RegexObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/RegexObject.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -d -r2.5 -r2.6
*** RegexObject.java 2001/02/02 11:29:42 2.5
--- RegexObject.java 2001/10/28 17:13:44 2.6
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: SHA1.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/SHA1.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -d -r2.3 -r2.4
*** SHA1.java 2001/10/27 21:43:27 2.3
--- SHA1.java 2001/10/28 17:13:44 2.4
***************
*** 12,16 ****
*
* Cryptix General License
! * Copyright © 1995, 1996, 1997, 1998, 1999, 2000 The Cryptix Foundation
* Limited.
* All rights reserved.
--- 12,16 ----
*
* Cryptix General License
! * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000 The Cryptix Foundation
* Limited.
* All rights reserved.
Index: Setup.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/Setup.java,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** Setup.java 2001/08/19 18:15:42 2.18
--- Setup.java 2001/10/28 17:13:44 2.19
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: binascii.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/binascii.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** binascii.java 2001/07/14 22:21:36 2.6
--- binascii.java 2001/10/28 17:13:44 2.7
***************
*** 3,7 ****
*
* This program contains material copyrighted by:
! * Copyright © 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
* Amsterdam, The Netherlands.
*/
--- 3,7 ----
*
* This program contains material copyrighted by:
! * Copyright (c) 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
* Amsterdam, The Netherlands.
*/
Index: cPickle.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cPickle.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** cPickle.java 2001/08/08 18:39:14 1.18
--- cPickle.java 2001/10/28 17:13:44 1.19
***************
*** 3,7 ****
*
* This program contains material copyrighted by:
! * Copyright © 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
* The Netherlands.
*/
--- 3,7 ----
*
* This program contains material copyrighted by:
! * Copyright (c) 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
* The Netherlands.
*/
Index: cStringIO.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cStringIO.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cStringIO.java 2001/10/27 21:55:45 1.9
--- cStringIO.java 2001/10/28 17:13:44 1.10
***************
*** 3,7 ****
*
* This program contains material copyrighted by:
! * Copyright © 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
* The Netherlands.
*/
--- 3,7 ----
*
* This program contains material copyrighted by:
! * Copyright (c) 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
* The Netherlands.
*/
Index: codeop.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/codeop.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** codeop.java 2001/07/25 18:48:43 2.6
--- codeop.java 2001/10/28 17:13:44 2.7
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: jarray.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/jarray.java,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** jarray.java 1999/05/17 19:55:20 2.1
--- jarray.java 2001/10/28 17:13:44 2.2
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
Index: math.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/math.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -d -r2.3 -r2.4
*** math.java 2000/10/09 14:45:15 2.3
--- math.java 2001/10/28 17:13:44 2.4
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: operator.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/operator.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** operator.java 2001/03/13 20:27:43 2.6
--- operator.java 2001/10/28 17:13:44 2.7
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: os.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/os.java,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** os.java 2001/03/13 20:29:42 2.6
--- os.java 2001/10/28 17:13:44 2.7
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: py_compile.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/py_compile.java,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -d -r2.3 -r2.4
*** py_compile.java 2001/07/16 17:02:33 2.3
--- py_compile.java 2001/10/28 17:13:44 2.4
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: re.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/re.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** re.java 2001/07/16 17:02:33 2.8
--- re.java 2001/10/28 17:13:44 2.9
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
Index: sha.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/sha.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** sha.java 2001/02/02 11:29:42 2.4
--- sha.java 2001/10/28 17:13:44 2.5
***************
*** 11,15 ****
public static String __doc__ =
"* Cryptix General License\n" +
! "* Copyright © 1995, 1996, 1997, 1998, 1999, 2000 The Cryptix"+
" Foundation\n" +
"* Limited. All rights reserved.\n" +
--- 11,15 ----
public static String __doc__ =
"* Cryptix General License\n" +
! "* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000 The Cryptix"+
" Foundation\n" +
"* Limited. All rights reserved.\n" +
Index: synchronize.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/synchronize.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** synchronize.java 2001/02/02 11:29:42 2.4
--- synchronize.java 2001/10/28 17:13:44 2.5
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
Index: thread.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/thread.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** thread.java 2001/03/13 20:28:10 2.4
--- thread.java 2001/10/28 17:13:44 2.5
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -d -r2.17 -r2.18
*** time.java 2001/08/15 16:45:37 2.17
--- time.java 2001/10/28 17:13:44 2.18
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
// An implementation of the Python standard time module. Currently
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
// An implementation of the Python standard time module. Currently
Index: types.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/types.java,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -d -r2.5 -r2.6
*** types.java 2001/03/13 20:28:22 2.5
--- types.java 2001/10/28 17:13:44 2.6
***************
*** 1,3 ****
! // Copyright © Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
--- 1,3 ----
! // Copyright (c) Corporation for National Research Initiatives
package org.python.modules;
import org.python.core.*;
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 17:13:47
|
Update of /cvsroot/jython/jython/org/python/rmi In directory usw-pr-cvs1:/tmp/cvs-serv23109/rmi Modified Files: UnicastRemoteObject.java Log Message: Fix for "[ #457614 ] pls change ©right; to (c) in sources". Index: UnicastRemoteObject.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/rmi/UnicastRemoteObject.java,v retrieving revision 2.2 retrieving revision 2.3 diff -C2 -d -r2.2 -r2.3 *** UnicastRemoteObject.java 1999/06/01 17:49:12 2.2 --- UnicastRemoteObject.java 2001/10/28 17:13:44 2.3 *************** *** 1,3 **** ! // Copyright © Corporation for National Research Initiatives package org.python.rmi; import java.rmi.*; --- 1,3 ---- ! // Copyright (c) Corporation for National Research Initiatives package org.python.rmi; import java.rmi.*; |
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 16:17:15
|
Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv12412
Modified Files:
PyInstance.java
Log Message:
Fix for "[ #475666 ] __nonzero__ exceptions must be ignored".
Index: PyInstance.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyInstance.java,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -d -r2.23 -r2.24
*** PyInstance.java 2001/08/11 10:39:32 2.23
--- PyInstance.java 2001/10/28 16:17:12 2.24
***************
*** 448,463 ****
public boolean __nonzero__() {
! PyObject ret = invoke_ex("__nonzero__");
! if (ret != null) {
! return ret.__nonzero__();
! }
!
try {
! return __len__() == 0 ? false : true;
! } catch (PyException exc) {
! if (Py.matchException(exc, Py.AttributeError))
return true;
- throw exc;
}
}
--- 448,471 ----
public boolean __nonzero__() {
! PyObject meth = null;
try {
! meth = __findattr__("__nonzero__");
! } catch (PyException exc) { }
!
! if (meth == null) {
! // Copied form __len__()
! CollectionProxy proxy = getCollection();
! if (proxy != CollectionProxy.NoProxy) {
! return proxy.__len__() != 0 ? true : false;
! }
! try {
! meth = __findattr__("__len__");
! } catch (PyException exc) { }
! if (meth == null)
return true;
}
+
+ PyObject ret = meth.__call__();
+ return ret.__nonzero__();
}
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 15:11:50
|
Update of /cvsroot/jython/jython/org/python/modules/sre
In directory usw-pr-cvs1:/tmp/cvs-serv539
Modified Files:
MatchObject.java
Log Message:
Fix "[ #458945 ] Missing 'lastindex' on match objects"
Index: MatchObject.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/sre/MatchObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MatchObject.java 2000/10/28 11:57:42 1.3
--- MatchObject.java 2001/10/28 15:11:47 1.4
***************
*** 206,209 ****
--- 206,215 ----
if (key == "re")
return pattern;
+ if (key == "pos")
+ return Py.newInteger(pos);
+ if (key == "endpos")
+ return Py.newInteger(endpos);
+ if (key == "lastindex")
+ return lastindex == -1 ? Py.None : Py.newInteger(lastindex);
return super.__findattr__(key);
}
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 15:10:39
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv381
Added Files:
test327.py
Log Message:
[ #458945 ] Missing 'lastindex' on match objects
--- NEW FILE: test327.py ---
"""
[ #458945 ] Missing 'lastindex' on match objects
"""
import support
import re
m = re.match(r"(\w*) (\w*) (\w*)", "word1 word2 word3")
if m.lastindex != 3:
raise support.TestError('Wrong lastindex value#1 : %d' % m.lastindex)
m = re.match(r"((\w*) )+", "word1 word2 word3 ")
if m.lastindex != 2:
raise support.TestError('Wrong lastindex value#2 : %d' % m.lastindex)
m = re.match(r"abc", "abc")
if m.lastindex != None:
raise support.TestError('Wrong lastindex value#3 : %d' % m.lastindex)
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 14:54:18
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv29770
Added Files:
test325.py
Log Message:
A pickle test.
--- NEW FILE: test325.py ---
"""
Verify a bug in pickle reported by mailling list.
"""
import support
# This program fails with pickle due to the id() problem.
#import pickle
import cPickle as pickle
pfile=open("test325.out","wb")
p=pickle.Pickler(pfile)
for l in range (1,10000):
row=[str(l),str(l)]
p.dump(row)
pfile.close()
#print "reading"
n=1
try:
pfile=open("test325.out","rb")
l=pickle.load(pfile)
while l:
comp = [str(n),str(n)]
if l != comp:
print "Pickle error"
print str(l) + " should be " + str(comp)
raise support.TestError("pickle is not working")
n=n+1
l=pickle.load(pfile)
pfile.close()
except EOFError:
#print "End reached, well done"
pfile.close()
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 14:51:04
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv29174
Added Files:
test323.py
Log Message:
A test that checks an initial sys.path value of "archive.zip!Lib".
--- NEW FILE: test323.py ---
"""
Test import of java class from sys.path zipfile.
"""
import support
import zipfile, time
#support.compileJava("test323d/test323j.java")
def addZipEntry(zip, name, data):
entry = zipfile.ZipInfo()
entry.filename = name
entry.date_time = time.gmtime(time.time())
zip.writestr(entry, data)
zip = zipfile.ZipFile("test323.zip", "w", zipfile.ZIP_DEFLATED)
addZipEntry(zip, "Lib/test323m.py", """
def compare(str, v1, v2):
#print str, v1, v2
assert v1 == v2, "%s '%s' '%s'" % (str, v1, v2)
compare("__name__", __name__, "test323m")
compare("__file__", __file__, "Lib/test323m.py")
""")
#zip.write("test323d/test323j.class", "test323j.class")
zip.close()
import sys
sys.path.append("test323.zip!Lib")
import test323m
sys.path.pop()
del test323m
del sys.modules['test323m']
import java
java.lang.System.gc()
time.sleep(4)
#raise support.TestWarning('A test of TestWarning. It is not an error')
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 14:46:24
|
Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv25605
Modified Files:
BaseEvaluator.py
Log Message:
Fix "[ #448485 ] Tuple unpacking raises KeyError" by calling
Py.unpackSequence() just like CodeCompiler does.
Index: BaseEvaluator.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/BaseEvaluator.py,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** BaseEvaluator.py 2001/07/29 14:59:13 2.11
--- BaseEvaluator.py 2001/10/28 14:46:20 2.12
***************
*** 107,116 ****
del seq[-1]
n = len(seq)
- tmp, code = self.makeTemp(value)
- stmts = [code]
for i in range(n):
! stmts.append(self.set(seq[i], tmp.igetitem(i)))
! self.freeTemp(tmp)
return stmts
--- 107,120 ----
del seq[-1]
n = len(seq)
+ unpacked = jast.InvokeStatic("org.python.core.Py", "unpackSequence",
+ [value.asAny(), jast.IntegerConstant(n)])
+ tmp = self.frame.gettemp('PyObject[]')
+ stmts = [ jast.Set(tmp, unpacked) ]
+
for i in range(n):
! code = jast.Subscript(tmp, i)
! stmts.append(self.set(seq[i], self.factory.makePyObject(code)))
! self.frame.freetemp(tmp)
return stmts
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-28 14:44:42
|
Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv25292
Modified Files:
SimpleCompiler.py
Log Message:
Added support for array type temporary vars. Needed for #448485.
Index: SimpleCompiler.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/SimpleCompiler.py,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** SimpleCompiler.py 2001/07/29 14:59:13 2.15
--- SimpleCompiler.py 2001/10/28 14:44:39 2.16
***************
*** 98,103 ****
temps.append(None)
! tname = "t$%d$%s" % (index, type)
temp = jast.Identifier(tname)
temps[index] = temp
#print 'get temp', index, type, temps
--- 98,104 ----
temps.append(None)
! tname = "t$%d$%s" % (index, type.replace("[]", "__"))
temp = jast.Identifier(tname)
+ temp.type = type
temps[index] = temp
#print 'get temp', index, type, temps
***************
*** 107,111 ****
parts = temp.name.split('$')
index = int(parts[1])
! type = parts[2]
temps = self.gettemps(type)
--- 108,112 ----
parts = temp.name.split('$')
index = int(parts[1])
! type = temp.type
temps = self.gettemps(type)
***************
*** 208,212 ****
names = []
for index in range(len(temps)):
! names.append("t$%d$%s" % (index, type))
ident = "%s %s" % (type, COMMASPACE.join(names))
decs.append(jast.Identifier(ident))
--- 209,213 ----
names = []
for index in range(len(temps)):
! names.append("t$%d$%s" % (index, type.replace("[]", "__")))
ident = "%s %s" % (type, COMMASPACE.join(names))
decs.append(jast.Identifier(ident))
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-27 22:29:49
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv20472
Modified Files:
support.py
Log Message:
Added runJython(...) function.
Index: support.py
===================================================================
RCS file: /cvsroot/jython/bugtests/support.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** support.py 2001/07/18 22:55:19 1.2
--- support.py 2001/10/27 22:29:47 1.3
***************
*** 73,76 ****
--- 73,95 ----
+ def runJython(cls, **kw):
+ cmd = "jython "
+ p = execCmd('cmd /C "%s %s"' % (cmd, cls))
+
+ import java
+ if kw.has_key("output"):
+ outstream = java.io.FileOutputStream(kw['output'])
+ else:
+ outstream = java.lang.System.out
+
+ import java
+ thread.start_new_thread(StreamReader, (p.inputStream, outstream))
+ thread.start_new_thread(StreamReader, (p.errorStream, outstream))
+ ret = p.waitFor()
+ if ret != 0 and not kw.has_key("expectError"):
+ raise TestError, "%s failed with %d" % (cmd, ret)
+ return ret
+
+
def StreamReader(instream, outstream):
while 1:
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-27 22:23:55
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv19065
Added Files:
test321.py
Log Message:
[ #475666 ] __nonzero__ exceptions must be ignored
--- NEW FILE: test321.py ---
"""
[ #475666 ] __nonzero__ exceptions must be ignored
"""
import support
msgs = []
class Foo:
def __getattr__(self, key):
msgs.append('getting %s' % key)
raise KeyError, key
foo = Foo()
if not foo: print 'no foo'
class Foo:
def __nonzero__(self):
msgs.append("called __nonzero__")
raise KeyError
foo = Foo()
try:
if not foo: print 'no foo'
except KeyError:
pass
else:
raise support.TestError('Must raise a keyerror')
support.compare(msgs, "['getting __nonzero__', 'getting __len__', 'called __nonzero__']")
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-27 22:21:44
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv18668
Added Files:
test314c.py
Log Message:
Added dependent file.
--- NEW FILE: test314c.py ---
import string
s = "elem1 elem2"
try:
(a, b, c) = string.split(s)
(d, e, f) = string.split(s)
pass
except ValueError:
pass
else:
print support.TestError("Should raise a ValueError")
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-27 22:20:47
|
Update of /cvsroot/jython/bugtests In directory usw-pr-cvs1:/tmp/cvs-serv18482 Modified Files: test314.py Log Message: Updated comment. Index: test314.py =================================================================== RCS file: /cvsroot/jython/bugtests/test314.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test314.py 2001/08/06 18:47:51 1.1 --- test314.py 2001/10/27 22:20:44 1.2 *************** *** 1,4 **** """ ! Basic test, just raises an TestError """ --- 1,4 ---- """ ! [ #448485 ] Tuple unpacking raises KeyError """ |
|
From: Finn Bock <bckfnn@us...> - 2001-10-27 22:18:54
|
Update of /cvsroot/jython/bugtests
In directory usw-pr-cvs1:/tmp/cvs-serv17958
Added Files:
test322.py test322m.py
Log Message:
[ #448398 ] open('test.txt','w').write('test') fails
--- NEW FILE: test322.py ---
"""
[ #448398 ] open('test.txt','w').write('test') fails
"""
import support
support.runJython("test322m.py")
import os
l = os.stat("test322.out")[6]
if l != 7:
raise support.TestWarning('The file should have been auto flushed')
--- NEW FILE: test322m.py ---
f = open('test322.out','w')
f.write("xvavava")
#f.flush()
|
|
From: Finn Bock <bckfnn@us...> - 2001-10-27 21:55:48
|
Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv12156
Modified Files:
cStringIO.java
Log Message:
Fix "[ #473676 ] cStringIO bug" where a 0 byte was return instead of
the empty string at EOF.
Index: cStringIO.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cStringIO.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cStringIO.java 2001/02/02 11:29:42 1.8
--- cStringIO.java 2001/10/27 21:55:45 1.9
***************
*** 141,145 ****
int newpos = (size < 0) ? count : Math.min(pos+size, count);
String r = null;
! if (size == 1) {
r = cStringIO.getString(buf[pos]);
} else {
--- 141,145 ----
int newpos = (size < 0) ? count : Math.min(pos+size, count);
String r = null;
! if (size == 1 && newpos > pos) {
r = cStringIO.getString(buf[pos]);
} else {
|