[Jython-checkins] jython (merge 2.5 -> default): Merge 2.5.

[frank.wierzbicki]

http://hg.python.org/jython/rev/bef3eb26155e
changeset:   6804:bef3eb26155e
parent:      6801:d4373bf3ada2
parent:      6803:6ca8838410c2
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Jul 18 10:27:57 2012 -0700
summary:
  Merge 2.5.

files:
  src/org/python/core/PyClass.java    |  4 ++--
  src/org/python/core/PyFunction.java |  2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/src/org/python/core/PyClass.java b/src/org/python/core/PyClass.java
--- a/src/org/python/core/PyClass.java
+++ b/src/org/python/core/PyClass.java
@@ -42,7 +42,7 @@
     }
 
     public static PyObject classobj___new__(PyObject name, PyObject bases, PyObject dict) {
-        if (!name.getType().isSubType(PyBaseString.TYPE)) {
+        if (!name.getType().isSubType(PyString.TYPE)) {
             throw Py.TypeError("PyClass_New: name must be a string");
         }
         if (!(dict instanceof PyStringMap || dict instanceof PyDictionary)) {
@@ -273,7 +273,7 @@
     }
 
     public void setName(PyObject value) {
-        if (value == null || !Py.isInstance(value, PyBaseString.TYPE)) {
+        if (value == null || !Py.isInstance(value, PyString.TYPE)) {
             throw Py.TypeError("__name__ must be a string object");
         }
         String name = value.toString();
diff --git a/src/org/python/core/PyFunction.java b/src/org/python/core/PyFunction.java
--- a/src/org/python/core/PyFunction.java
+++ b/src/org/python/core/PyFunction.java
@@ -104,7 +104,7 @@
             throw Py.TypeError("function() argument 1 must be code, not " +
                                code.getType().fastGetName());
         }
-        if (name != Py.None && !Py.isInstance(name, PyBaseString.TYPE)) {
+        if (name != Py.None && !Py.isInstance(name, PyString.TYPE)) {
             throw Py.TypeError("arg 3 (name) must be None or string");
         }
         if (defaults != Py.None && !(defaults instanceof PyTuple)) {

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