[Jython-checkins] jython: #1835 s/occured/occurred/

[frank.wierzbicki]

http://hg.python.org/jython/rev/9c9c311c201b
changeset:   6303:9c9c311c201b
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri Feb 10 10:29:16 2012 -0800
summary:
  #1835 s/occured/occurred/

files:
  NEWS                                          |  1 +
  src/org/python/core/AbstractArray.java        |  2 +-
  src/org/python/core/PyBaseCode.java           |  2 +-
  src/org/python/core/PyTableCode.java          |  2 +-
  src/org/python/modules/posix/PosixModule.java |  4 ++--
  5 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 
 Jython 2.6a1
   Bugs Fixed
+    - [ 1835 ] s/occured/occurred/ :)
     - [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
     - [ 1735 ] return type of os.read is unicode, not str
     - [ 1755 ] os.utime('/tmp/nonexistent-file', None) fails to raise OSError
diff --git a/src/org/python/core/AbstractArray.java b/src/org/python/core/AbstractArray.java
--- a/src/org/python/core/AbstractArray.java
+++ b/src/org/python/core/AbstractArray.java
@@ -51,7 +51,7 @@
 
     /**
      * The modification count increment indicates if a structural change
-     * occured as a result of an operation that would make concurrent iteration
+     * occurred as a result of an operation that would make concurrent iteration
      * over the array invalid.  It is typically used by subclasses that
      * extend <CODE>AbstractList</CODE>, by adding the value to
      * <CODE>AbstractList.modCount</CODE> after performing a potentially
diff --git a/src/org/python/core/PyBaseCode.java b/src/org/python/core/PyBaseCode.java
--- a/src/org/python/core/PyBaseCode.java
+++ b/src/org/python/core/PyBaseCode.java
@@ -67,7 +67,7 @@
         try {
             ret = interpret(frame, ts);
         } catch (Throwable t) {
-            // Convert exceptions that occured in Java code to PyExceptions
+            // Convert exceptions that occurred in Java code to PyExceptions
             PyException pye = Py.JavaError(t);
             pye.tracebackHere(frame);
 
diff --git a/src/org/python/core/PyTableCode.java b/src/org/python/core/PyTableCode.java
--- a/src/org/python/core/PyTableCode.java
+++ b/src/org/python/core/PyTableCode.java
@@ -164,7 +164,7 @@
         try {
             ret = funcs.call_function(func_id, frame, ts);
         } catch (Throwable t) {
-            // Convert exceptions that occured in Java code to PyExceptions
+            // Convert exceptions that occurred in Java code to PyExceptions
             PyException pye = Py.JavaError(t);
             pye.tracebackHere(frame);
 
diff --git a/src/org/python/modules/posix/PosixModule.java b/src/org/python/modules/posix/PosixModule.java
--- a/src/org/python/modules/posix/PosixModule.java
+++ b/src/org/python/modules/posix/PosixModule.java
@@ -485,7 +485,7 @@
             if (!file.canRead()) {
                 throw Py.OSError(Errno.EACCES, path);
             }
-            throw Py.OSError("listdir(): an unknown error occured: " + path);
+            throw Py.OSError("listdir(): an unknown error occurred: " + path);
         }
 
         PyList list = new PyList();
@@ -738,7 +738,7 @@
             if (!file.canWrite()) {
                 throw Py.OSError(Errno.EPERM, path);
             }
-            throw Py.OSError("unlink(): an unknown error occured" + absolutePath);
+            throw Py.OSError("unlink(): an unknown error occurred" + absolutePath);
         }
     }
 

-- 
Repository URL: http://hg.python.org/jython