jython-checkins — For Jython checkin messages

[Jython-checkins] CVS: jython build.xml,1.30,1.31

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

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

Modified Files:
	build.xml 
Log Message:
Copy the entire CPython testsuite to dist. Obviously I can't decide
what I want to use dist for.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** build.xml	26 May 2002 20:26:37 -0000	1.30
--- build.xml	29 May 2002 18:41:51 -0000	1.31
***************
*** 412,416 ****
                  warnings.py,
                  encodings/*.py,
!                 test/pystone.py,
              "/>
  
--- 412,416 ----
                  warnings.py,
                  encodings/*.py,
!                 test/**,
              "/>
  

[Jython-checkins] CVS: htdocs users.ht,1.10,1.11

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

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

Modified Files:
	users.ht 
Log Message:
Added VisAD.



Index: users.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/users.ht,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** users.ht	27 May 2002 15:44:01 -0000	1.10
--- users.ht	29 May 2002 10:41:59 -0000	1.11
***************
*** 51,53 ****
--- 51,58 ----
  existing business objects.
  
+ <p><dt><b><a href="http://www.ssec.wisc.edu/~billh/visad.html">VisAD</a></b>
+ <dd>VisAD is a Java component library for interactive and collaborative
+ visualization and analysis of numerical data. It uses Jython to define
+ an easy-to-use scripting language.
+ 
  </dl>

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

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

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

Modified Files:
	__builtin__.java 
Log Message:
Fix copy/paste error in recent zip iteration code.



Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -d -r2.47 -r2.48
*** __builtin__.java	26 May 2002 20:55:03 -0000	2.47
--- __builtin__.java	27 May 2002 15:50:34 -0000	2.48
***************
*** 956,960 ****
                  }
                  if (item == null)
!                     return null;
                  next[j] = item;
              }
--- 956,960 ----
                  }
                  if (item == null)
!                     return ret;
                  next[j] = item;
              }

[Jython-checkins] CVS: htdocs build.xml,1.5,1.6

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

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

Modified Files:
	build.xml 
Log Message:
Get the javadoc from ./dist dir.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/htdocs/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml	16 Jan 2002 17:40:13 -0000	1.5
--- build.xml	27 May 2002 15:44:24 -0000	1.6
***************
*** 79,83 ****
          </copy>
          <copy todir="docs/javadoc">
!             <fileset dir="${jython.home}/Doc/javadoc"
                       includes="**/*.html,*.css"/>
          </copy>
--- 79,83 ----
          </copy>
          <copy todir="docs/javadoc">
!             <fileset dir="${jython.home}/dist/Doc/javadoc"
                       includes="**/*.html,*.css"/>
          </copy>

[Jython-checkins] CVS: htdocs users.ht,1.9,1.10

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

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

Modified Files:
	users.ht 
Log Message:
Added BISON Solution.



Index: users.ht
===================================================================
RCS file: /cvsroot/jython/htdocs/users.ht,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** users.ht	10 May 2002 08:47:14 -0000	1.9
--- users.ht	27 May 2002 15:44:01 -0000	1.10
***************
*** 45,47 ****
--- 45,53 ----
  for general Jython development too.
  
+ <p><dt><b><a href="http://www.bison-group.com">BISON Solution</a></b>
+ <dd>BISON Solution is the first process oriented Business Solution
+ developed in 100% pure Java and fulfilling the J2EE Standards. 
+ BISON Solution uses Jython for scripting and high-level customizing of
+ existing business objects.
+ 
  </dl>

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

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

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

Modified Files:
	PyArray.java 
Log Message:
Support negative step slices for java array.



Index: PyArray.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyArray.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** PyArray.java	6 Jan 2002 21:19:13 -0000	2.8
--- PyArray.java	26 May 2002 21:00:49 -0000	2.9
***************
*** 83,91 ****
  
      protected PyObject getslice(int start, int stop, int step) {
!         if (step != 1)
!             throw Py.TypeError("step != 1 not implemented yet");
!         int n = stop-start;
          PyArray ret = new PyArray(type, n);
!         System.arraycopy(data, start, ret.data, 0, n);
          return ret;
      }
--- 83,100 ----
  
      protected PyObject getslice(int start, int stop, int step) {
!         if (step > 0 && stop < start)
!             stop = start;
!         int n = sliceLength(start, stop, step);
! 
          PyArray ret = new PyArray(type, n);
!         if (step == 1) {
!             System.arraycopy(data, start, ret.data, 0, n);
!             return ret;
!         }
!         int j = 0;
!         for (int i = start; j < n; i += step) {
!             Array.set(ret.data, j, Array.get(data, i));
!             j++;
!         }
          return ret;
      }

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

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

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

Modified Files:
	types.java 
Log Message:
Added StringTypes.



Index: types.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/types.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** types.java	27 Nov 2001 19:07:22 -0000	2.7
--- types.java	26 May 2002 20:56:04 -0000	2.8
***************
*** 50,53 ****
--- 50,57 ----
          dict.__setitem__("UnicodeType", PyJavaClass.lookup(PyString.class));
          dict.__setitem__("XRangeType", PyJavaClass.lookup(PyXRange.class));
+ 
+         dict.__setitem__("StringTypes", new PyList(new PyObject[] {
+                 PyJavaClass.lookup(PyString.class)
+         }));
      }
  }

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

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

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

Modified Files:
	__builtin__.java 
Log Message:
Added a dummy object() builtin, just to make pickle.py happy.



Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -d -r2.46 -r2.47
*** __builtin__.java	26 May 2002 20:53:45 -0000	2.46
--- __builtin__.java	26 May 2002 20:55:03 -0000	2.47
***************
*** 417,420 ****
--- 417,424 ----
      }
  
+     public static PyObject object() {
+         return new PyObject();
+     }
+ 
      private static PyStringMap internedStrings;
      public static PyString intern(PyString s) {

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

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

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

Modified Files:
	__builtin__.java 
Log Message:
Throw TypeError when abs() argument isn't a number. I wish I had a better
solution.



Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.45
retrieving revision 2.46
diff -C2 -d -r2.45 -r2.46
*** __builtin__.java	26 May 2002 20:51:46 -0000	2.45
--- __builtin__.java	26 May 2002 20:53:45 -0000	2.46
***************
*** 137,141 ****
  
      public static PyObject abs(PyObject o) {
!         return o.__abs__();
      }
  
--- 137,143 ----
  
      public static PyObject abs(PyObject o) {
!         if (o.isNumberType())
!             return o.__abs__();
!         throw Py.TypeError("bad operand type for abs()");
      }
  

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

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

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

Modified Files:
	__builtin__.java 
Log Message:
Made zip() use the __iter__ protocol.



Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.44
retrieving revision 2.45
diff -C2 -d -r2.44 -r2.45
*** __builtin__.java	26 May 2002 20:47:20 -0000	2.44
--- __builtin__.java	26 May 2002 20:51:46 -0000	2.45
***************
*** 921,937 ****
  
          // Type check the arguments; they must be sequences.  Might as well
!         // cache the __getitem__() methods.
!         PyObject[] getitems = new PyObject[itemsize];
  
          for (int j=0; j < itemsize; j++) {
!             PyObject getitem = argstar[j].__findattr__("__getitem__");
!             if (getitem == null) {
!                 // Get the same error as CPython for instances.  This
!                 // should throw an AttributeError.
!                 if (argstar[j] instanceof PyInstance)
!                     argstar[j].__getattr__("__getitem__");
!                 throw Py.TypeError("unindexable object");
              }
!             getitems[j] = getitem;
          }
  
--- 921,934 ----
  
          // Type check the arguments; they must be sequences.  Might as well
!         // cache the __iter__() methods.
!         PyObject[] iters = new PyObject[itemsize];
  
          for (int j=0; j < itemsize; j++) {
!             PyObject iter = argstar[j].__iter__();
!             if (iter == null) {
!                 throw Py.TypeError("zip argument #" + (j + 1) +
!                                    " must support iteration");
              }
!             iters[j] = iter;
          }
  
***************
*** 945,955 ****
              for (int j=0; j < itemsize; j++) {
                  try {
!                     item = getitems[j].__call__(index);
                  }
                  catch (PyException e) {
!                     if (Py.matchException(e, Py.IndexError))
                          return ret;
                      throw e;
                  }
                  next[j] = item;
              }
--- 942,954 ----
              for (int j=0; j < itemsize; j++) {
                  try {
!                     item = iters[j].__iternext__();
                  }
                  catch (PyException e) {
!                     if (Py.matchException(e, Py.StopIteration))
                          return ret;
                      throw e;
                  }
+                 if (item == null)
+                     return null;
                  next[j] = item;
              }

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

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

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

Modified Files:
	__builtin__.java 
Log Message:
Added restrictions on complex() arguments.



Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.43
retrieving revision 2.44
diff -C2 -d -r2.43 -r2.44
*** __builtin__.java	11 Mar 2002 13:22:30 -0000	2.43
--- __builtin__.java	26 May 2002 20:47:20 -0000	2.44
***************
*** 217,220 ****
--- 217,225 ----
  
      public static PyComplex complex(PyObject real, PyObject imag) {
+         if (real instanceof PyString)
+             throw Py.TypeError("complex() can't take second arg" + 
+                                " if first is a string");
+         if (imag instanceof PyString)
+             throw Py.TypeError("complex() second arg can't be a string");
          return (PyComplex)real.__complex__().__add__(
              imag.__complex__().__mul__(PyComplex.J));

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

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

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

Modified Files:
	PyString.java 
Log Message:
Added .decode() methods.



Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.55
retrieving revision 2.56
diff -C2 -d -r2.55 -r2.56
*** PyString.java	26 May 2002 20:41:13 -0000	2.55
--- PyString.java	26 May 2002 20:45:04 -0000	2.56
***************
*** 1797,1800 ****
--- 1797,1812 ----
          return codecs.encode(this, encoding, errors);
      }
+ 
+     public PyString decode() {
+         return encode(null, null);
+     }
+ 
+     public PyString decode(String encoding) {
+         return decode(encoding, null);
+     }
+ 
+     public PyString decode(String encoding, String errors) {
+         return codecs.decode(this, encoding, errors);
+     }
  }
  

[Jython-checkins] CVS: jython ACKNOWLEDGMENTS,2.18,2.19

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

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

Modified Files:
	ACKNOWLEDGMENTS 
Log Message:
Adding Noel (Nick) Lockwood for "[ 511321 ] Jython complex from string"
patch



Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /cvsroot/jython/jython/ACKNOWLEDGMENTS,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** ACKNOWLEDGMENTS	20 Dec 2001 16:46:07 -0000	2.18
--- ACKNOWLEDGMENTS	26 May 2002 20:43:03 -0000	2.19
***************
*** 54,57 ****
--- 54,58 ----
      Randy Jay Yarger
      Matt Conway
+     Noel (Nick) Lockwood
  
  Local Variables:

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

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

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

Modified Files:
	PyString.java 
Log Message:
Fix several bugs in string->complex conversion.
Fixes patch "[ 511321 ] Jython complex from string".



Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.54
retrieving revision 2.55
diff -C2 -d -r2.54 -r2.55
*** PyString.java	6 Jan 2002 21:19:13 -0000	2.54
--- PyString.java	26 May 2002 20:41:13 -0000	2.55
***************
*** 760,781 ****
              char c = string.charAt(s);
              switch (c) {
-             case '\0':
-                 if (s != n)
-                     throw Py.ValueError("null byte in argument for " +
-                                         "complex()");
-                 if (!done)
-                     sw_error = true;
-                 break;
- 
              case '-':
                  sign = -1;
                  /* Fallthrough */
              case '+':
!                 if (done)
                      sw_error = true;
!                 s++;
!                 c = string.charAt(s);
!                 if  (c == '\0' || c == '+' || c == '-' ||
!                            Character.isSpaceChar(c))
                      sw_error = true;
                  break;
--- 760,776 ----
              char c = string.charAt(s);
              switch (c) {
              case '-':
                  sign = -1;
                  /* Fallthrough */
              case '+':
!                 if (done || s+1 == n) {
                      sw_error = true;
!                     break;
!                 }
!                 //  a character is guaranteed, but it better be a digit
!                 //  or J or j
!                 c = string.charAt(++s);  //  eat the sign character
!                                          //  and check the next
!                 if  (!Character.isDigit(c) && c!='J' && c!='j')
                      sw_error = true;
                  break;
***************
*** 793,816 ****
                  }
                  got_im = true;
!                 s++;
!                 c = string.charAt(s);
  
!                 if  (c != '+' && c != '-')
!                     done = true;
                  break;
  
              default:
-                 if (Character.isSpaceChar(c)) {
-                     while (s < n && Character.isSpaceChar(string.charAt(s)))
-                         s++;
-                     if (s != n)
-                         sw_error = true;
-                     else
-                         done = true;
-                     break;
-                 }
-                 c = string.charAt(s);
                  boolean digit_or_dot = (c == '.' || Character.isDigit(c));
!                 if (done || !digit_or_dot) {
                      sw_error = true;
                      break;
--- 788,806 ----
                  }
                  got_im = true;
!                 done = got_re;
!                 sign = 1;
!                 s++; // eat the J or j 
!                 break;
  
!             case ' ':
!                 while (s < n && Character.isSpaceChar(string.charAt(s)))
!                     s++;
!                 if (s != n)
!                     sw_error = true;
                  break;
  
              default:
                  boolean digit_or_dot = (c == '.' || Character.isDigit(c));
!                 if (!digit_or_dot) {
                      sw_error = true;
                      break;
***************
*** 819,825 ****
                  z = Double.valueOf(string.substring(s, end)).doubleValue();
                  s=end;
!                 c = string.charAt(s);
!                 if  (c == 'J' || c == 'j') {
!                     break;
                  }
                  if  (got_re) {
--- 809,817 ----
                  z = Double.valueOf(string.substring(s, end)).doubleValue();
                  s=end;
!                 if (s < n) {
!                     c = string.charAt(s);
!                     if  (c == 'J' || c == 'j') {
!                         break;
!                     }
                  }
                  if  (got_re) {
***************
*** 831,836 ****
                  x = sign * z;
                  got_re = true;
!                 if (got_im)
!                     done = true;
                  z = -1.0;
                  sign = 1;
--- 823,827 ----
                  x = sign * z;
                  got_re = true;
!                 done = got_im;
                  z = -1.0;
                  sign = 1;
***************
*** 859,870 ****
              if (c == 'e' || c == 'E') {
                  if (s < n) {
!                     c = string.charAt(s++);
                      if (c == '+' || c == '-')
!                         continue;
                  }
              }
!             break;
          }
!         return s-1;
      }
  
--- 850,862 ----
              if (c == 'e' || c == 'E') {
                  if (s < n) {
!                     c = string.charAt(s);
                      if (c == '+' || c == '-')
!                         s++;
!                     continue;
                  }
              }
!             return s-1;
          }
!         return s;
      }
  

[Jython-checkins] CVS: jython/org/python/core PyNone.java,2.7,2.8

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

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

Modified Files:
	PyNone.java 
Log Message:
Make None a non-number.



Index: PyNone.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyNone.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** PyNone.java	28 Oct 2001 17:13:43 -0000	2.7
--- PyNone.java	26 May 2002 20:38:01 -0000	2.8
***************
*** 30,33 ****
--- 30,34 ----
      public boolean isMappingType() { return false; }
      public boolean isSequenceType() { return false; }
+     public boolean isNumberType() { return false; }
  
      // __class__ boilerplate -- see PyObject for details

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

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

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

Modified Files:
	PyFunction.java 
Log Message:
Disallow None as function __dict__ value (new in 2.2).



Index: PyFunction.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFunction.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** PyFunction.java	27 Nov 2001 19:07:21 -0000	2.14
--- PyFunction.java	26 May 2002 20:37:28 -0000	2.15
***************
*** 99,106 ****
              if (value instanceof PyDictionary || value instanceof PyStringMap)
                  __dict__ = value;
-             else if (value == Py.None)
-                 __dict__ = null;
              else
!                 throw Py.TypeError("func_dict must be set to a dict object");
          } else {
              if (__dict__ == null)
--- 99,105 ----
              if (value instanceof PyDictionary || value instanceof PyStringMap)
                  __dict__ = value;
              else
!                 throw Py.TypeError("setting function's dictionary " + 
!                                    "to a non-dict");
          } else {
              if (__dict__ == null)
***************
*** 112,117 ****
      public void __delattr__(String name) {
          if (name == "__dict__" || name == "func_dict") {
!             __dict__ = null;
!             return;
          } else if (name == "func_defaults") {
              func_defaults = Py.EmptyObjects;
--- 111,115 ----
      public void __delattr__(String name) {
          if (name == "__dict__" || name == "func_dict") {
!             throw Py.TypeError("function's dictionary may not be deleted");
          } else if (name == "func_defaults") {
              func_defaults = Py.EmptyObjects;
***************
*** 145,151 ****
              return new PyTuple(func_defaults);
          }
!         if (name == "__dict__") {
              if (__dict__ == null)
!                 return Py.None;
              return __dict__;
          }
--- 143,149 ----
              return new PyTuple(func_defaults);
          }
!         if (name == "__dict__" || name == "func_dict") {
              if (__dict__ == null)
!                 __dict__ = new PyStringMap();
              return __dict__;
          }

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

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

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

Modified Files:
	PyFloat.java 
Log Message:
Restrict 3 arg pow to integers (new in 2.2).



Index: PyFloat.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFloat.java,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** PyFloat.java	13 Jan 2002 18:20:31 -0000	2.11
--- PyFloat.java	26 May 2002 20:35:59 -0000	2.12
***************
*** 263,268 ****
              return null;
  
!         if (modulo != null && !canCoerce(modulo))
!             return null;
  
          return _pow(value, coerce(right), modulo);
--- 263,270 ----
              return null;
  
!         if (modulo != null) {
!             throw Py.TypeError("pow() 3rd argument not allowed " +
!                                "unless all arguments are integers");
!         }
  
          return _pow(value, coerce(right), modulo);

[Jython-checkins] CVS: jython/org/python/core PyFile.java,2.25,2.26

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

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

Modified Files:
	PyFile.java 
Log Message:
Check for valid open mode flags.



Index: PyFile.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyFile.java,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -d -r2.25 -r2.26
*** PyFile.java	16 Dec 2001 11:22:22 -0000	2.25
--- PyFile.java	26 May 2002 20:34:11 -0000	2.26
***************
*** 722,725 ****
--- 722,729 ----
          char c3 = ' ';
          int n = mode.length();
+         for (int i = 0; i < n; i++) {
+             if ("awrtb+".indexOf(mode.charAt(i)) < 0)
+                 throw Py.IOError("Unknown open mode:" + mode);
+         }
          if (n > 0) {
              c1 = mode.charAt(0);

[Jython-checkins] CVS: jython/org/python/core Py.java,2.64,2.65

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

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

Modified Files:
	Py.java 
Log Message:
Added newLong(BigInteger), needed by the int/long unification.



Index: Py.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v
retrieving revision 2.64
retrieving revision 2.65
diff -C2 -d -r2.64 -r2.65
*** Py.java	6 Jan 2002 21:19:13 -0000	2.64
--- Py.java	26 May 2002 20:29:47 -0000	2.65
***************
*** 433,436 ****
--- 433,440 ----
      }
  
+     public static PyLong newLong(java.math.BigInteger i) {
+         return new PyLong(i);
+     }
+ 
      public static PyComplex newImaginary(double v) {
          return new PyComplex(0, v);

[Jython-checkins] CVS: jython build.xml,1.29,1.30

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

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

Modified Files:
	build.xml 
Log Message:
Copy startup scripts to dist dir.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** build.xml	26 May 2002 20:19:42 -0000	1.29
--- build.xml	26 May 2002 20:26:37 -0000	1.30
***************
*** 273,276 ****
--- 273,280 ----
                  registry,
                  build.xml,
+                 jython.bat,
+                 jythonc.bat,
+                 jython,
+                 jythonc,
                  "/>
          </copy>

[Jython-checkins] CVS: jython jython,NONE,1.1 jythonc,NONE,1.1

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

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

Added Files:
	jython jythonc 
Log Message:
Example startup scripts for unix.



--- NEW FILE: jython ---
#!/bin/sh
# This file is *not* generated by any installers.
# It is here only as an convinience to users running from
# the jython CVS.
java -Dpython.home=$JYTHON_HOME org.python.util.jython "$@"

--- NEW FILE: jythonc ---
#!/bin/sh
# This file is *not* generated by any installers.
# It is here only as an convinience to users running from
# the jython CVS.
$JYTHON_HOME/jython $JYTHON_HOME/Tools/jythonc/jythonc.py "$@"

[Jython-checkins] CVS: jython build.xml,1.28,1.29

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

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

Modified Files:
	build.xml 
Log Message:
Default target is copy-dist
Create jython.jar directly in dist.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** build.xml	19 May 2002 17:52:31 -0000	1.28
--- build.xml	26 May 2002 20:19:42 -0000	1.29
***************
*** 1,5 ****
  <!-- Copyright 2000 Dj Walker-Morgan -->
  
! <project name="jython" default="jar" basedir=".">
  
      <!--
--- 1,5 ----
  <!-- Copyright 2000 Dj Walker-Morgan -->
  
! <project name="jython" default="copy-dist" basedir=".">
  
      <!--
***************
*** 218,222 ****
          <echo file="${outputDir}/mainClass.mf"
                message="Main-Class: org.python.util.jython${line.separator}"/>
!         <jar jarfile="jython.jar"
               basedir="${outputDir}"
               manifest="${outputDir}/mainClass.mf"
--- 218,222 ----
          <echo file="${outputDir}/mainClass.mf"
                message="Main-Class: org.python.util.jython${line.separator}"/>
!         <jar jarfile="${distDir}/jython.jar"
               basedir="${outputDir}"
               manifest="${outputDir}/mainClass.mf"
***************
*** 263,267 ****
      </target>
  
!     <target name="copy-dist" depends="dist-prepare,compile">
          <!-- Misc files -->
          <copy todir="${distDir}">
--- 263,267 ----
      </target>
  
!     <target name="copy-dist" depends="dist-prepare,jar">
          <!-- Misc files -->
          <copy todir="${distDir}">
***************
*** 272,276 ****
                  README.txt,
                  registry,
-                 jython.jar,
                  build.xml,
                  "/>
--- 272,275 ----

[Jython-checkins] CVS: jython build.xml,1.27,1.28

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

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

Modified Files:
	build.xml 
Log Message:
Only run jjtree and javacc when the javaccHome2 property is set.



Index: build.xml
===================================================================
RCS file: /cvsroot/jython/jython/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** build.xml	5 Apr 2002 15:47:07 -0000	1.27
--- build.xml	19 May 2002 17:52:31 -0000	1.28
***************
*** 122,126 ****
      </target>
  
!     <target name="tree" depends="prepare">
          <jjtree
              javacchome="${javaccHome2}"
--- 122,126 ----
      </target>
  
!     <target name="tree" depends="prepare" if="javaccHome2">
          <jjtree
              javacchome="${javaccHome2}"
***************
*** 130,134 ****
      </target>
  
!     <target name="parser" depends="tree">
          <javacc
              javacchome="${javaccHome2}"
--- 130,134 ----
      </target>
  
!     <target name="parser" depends="tree" if="javaccHome2">
          <javacc
              javacchome="${javaccHome2}"

[Jython-checkins] CVS: jython/com/ziclix/python/sql Fetch.java,1.11,1.12

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython/com/ziclix/python/sql
In directory usw-pr-cvs1:/tmp/cvs-serv17471/com/ziclix/python/sql

Modified Files:
	Fetch.java 
Log Message:
added accessor for description

Index: Fetch.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/Fetch.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Fetch.java	10 May 2002 16:08:44 -0000	1.11
--- Fetch.java	16 May 2002 01:41:32 -0000	1.12
***************
*** 52,56 ****
  
  	/** Field cursor */
! 	protected DataHandler datahandler;
  
  	/** Field description */
--- 52,56 ----
  
  	/** Field cursor */
! 	private DataHandler datahandler;
  
  	/** Field description */
***************
*** 58,62 ****
  
  	/** A list of warning listeners. */
! 	protected List listeners;
  
  	/**
--- 58,62 ----
  
  	/** A list of warning listeners. */
! 	private List listeners;
  
  	/**
***************
*** 101,104 ****
--- 101,112 ----
  
  	/**
+ 	 * The description of each column, in order, for the data in the result
+ 	 * set.
+ 	 */
+ 	public PyObject getDescription() {
+ 		return this.description;
+ 	}
+ 
+ 	/**
  	 * Create the results after a successful execution and manages the result set.
  	 *
***************
*** 622,626 ****
  
  		if (this.rownumber < this.rowcount) {
! 			res = current.__getslice__(Py.newInteger(this.rownumber), Py.newInteger(this.rownumber + size), Py.newInteger(1));
  			this.rownumber += size;
  		}
--- 630,634 ----
  
  		if (this.rownumber < this.rowcount) {
! 			res = current.__getslice__(Py.newInteger(this.rownumber), Py.newInteger(this.rownumber + size), Py.One);
  			this.rownumber += size;
  		}

[Jython-checkins] CVS: jython/com/ziclix/python/sql/procedure SQLServerProcedure.java,NONE,1.1

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython/com/ziclix/python/sql/procedure
In directory usw-pr-cvs1:/tmp/cvs-serv25484/com/ziclix/python/sql/procedure

Added Files:
	SQLServerProcedure.java 
Log Message:
extensible stored procedures

--- NEW FILE: SQLServerProcedure.java ---

/*
 * Jython Database Specification API 2.0
 *
 * $Id: SQLServerProcedure.java,v 1.1 2002/05/10 16:11:41 bzimmer Exp $
 *
 * Copyright (c) 2002 brian zimmer <mailto:bz...@zi...>
 *
 */
package com.ziclix.python.sql.procedure;

import java.sql.*;
import org.python.core.*;
import com.ziclix.python.sql.*;

/**
 * Stored procedure support for SQLServer.
 *
 * @author brian zimmer
 * @author last revised by $Author: bzimmer $
 * @version $Revision: 1.1 $
 */
public class SQLServerProcedure extends Procedure {

	public SQLServerProcedure(PyCursor cursor, PyObject name) throws SQLException {
		super(cursor, name);
	}

	protected PyObject getDefault() {
		return Py.None;
	}

	protected String getProcedureName() {

		StringBuffer proc = new StringBuffer();

		if (this.procedureSchema.__nonzero__()) {
			proc.append(this.procedureSchema.toString()).append(".");
		}

		return proc.append(this.procedureName.toString()).toString();
	}
}