Frank Wierzbicki avatar Frank Wierzbicki committed 32cee9b Merge

Merge.

Comments (0)

Files changed (3)

src/org/python/core/PyClass.java

     }
 
     public static PyObject classobj___new__(PyObject name, PyObject bases, PyObject dict) {
-        if (!name.getType().isSubType(PyString.TYPE)) {
+        if (!name.getType().isSubType(PyBaseString.TYPE)) {
             throw Py.TypeError("PyClass_New: name must be a string");
         }
         if (!(dict instanceof PyStringMap || dict instanceof PyDictionary)) {
     }
 
     public void setName(PyObject value) {
-        if (value == null || !Py.isInstance(value, PyString.TYPE)) {
+        if (value == null || !Py.isInstance(value, PyBaseString.TYPE)) {
             throw Py.TypeError("__name__ must be a string object");
         }
         String name = value.toString();

src/org/python/core/PyFunction.java

             throw Py.TypeError("function() argument 1 must be code, not " +
                                code.getType().fastGetName());
         }
-        if (name != Py.None && !Py.isInstance(name, PyString.TYPE)) {
+        if (name != Py.None && !Py.isInstance(name, PyBaseString.TYPE)) {
             throw Py.TypeError("arg 3 (name) must be None or string");
         }
         if (defaults != Py.None && !(defaults instanceof PyTuple)) {

src/org/python/core/imp.java

 
             StringBuilder modNameBuffer = new StringBuilder(name);
             for (PyObject item : fromlist.asIterable()) {
-                if (!Py.isInstance(item, PyString.TYPE)) {
+                if (!Py.isInstance(item, PyBaseString.TYPE)) {
                     throw Py.TypeError("Item in ``from list'' not a string");
                 }
                 if (item.toString().equals("*")) {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.