Still more changes

Author: Thrameos

native/jpype_module/src/main/java/python/lang/PyExc.java

@@ -21,6 +21,7 @@
 import java.util.logging.Logger;
 import python.exception.PyException;
 import static python.lang.PyExceptionFactory.LOOKUP;
+import static python.lang.PyBuiltIn.*;
 
 /**
  * Native version of a Python exception.
@@ -38,10 +39,8 @@ public interface PyExc extends PyObject
    */
   static Exception of(PyExc base)
   {
-System.out.println("PyExc.of");
-    PyType type = base.getType();
+    PyType type = type(base);
     String name = type.getName();
-System.out.println("PyExc.of "+name);
     Class cls = LOOKUP.get(name);
     if (cls == null)
     {

native/jpype_module/src/main/java/python/lang/PyJavaObject.java

@@ -16,12 +16,7 @@
 package python.lang;
 
 import java.util.Objects;
-import org.jpype.bridge.Context;
 import python.protocol.PyAttributes;
-import python.protocol.PyCallable;
-import python.protocol.PyMapping;
-import python.protocol.PyNumber;
-import python.protocol.PySequence;
 
 /**
  * Java front end for a Python wrapped Java object.
@@ -37,54 +32,17 @@ public PyJavaObject(Object obj)
   }
 
   @Override
-  public PyAttributes asAttributes()
+  public PyAttributes getAttributes()
   {
     // Java objects don't support Python attributes directly.
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public PyCallable asCallable()
-  {
-    // Java objects don't act as Python functions.
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public PyMapping asMapping()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public PyNumber asNumber()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public PySequence asSequence()
-  {
-    // Java objects don't act as Python sequences
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public PyObject bytes()
-  {
-    throw new UnsupportedOperationException();
-  }
-
   public Object get()
   {
     return obj_;
   }
 
-  @Override
-  public PyType getType()
-  {
-    return Context.type(obj_);
-  }
 
   @Override
   public int hashCode()
@@ -105,10 +63,4 @@ public boolean equals(Object obj)
     return Objects.equals(this.obj_, other.obj_);
   }
 
-  @Override
-  public boolean isInstance(PyObject cls)
-  {
-    throw new UnsupportedOperationException();
-  }
-
 }

native/jpype_module/src/main/java/python/lang/PyObject.java

@@ -15,18 +15,15 @@
  */
 package python.lang;
 
-import python.protocol.PyCallable;
-import python.protocol.PySequence;
 import python.protocol.PyAttributes;
-import python.protocol.PyMapping;
-import python.protocol.PyNumber;
 
 /**
  * PyObject is a representation of a generic object in Python.
  *
- * PyObjects are very generic and thus must be converted to a protocol using the
- * "as" methods. Specific Java like behaviors are implemented on the protocols
- * where applicable.
+ * PyObject when created inherit from multiple Java interfaces called protocols
+ * based on their duck type behavior. Use `instanceof` and casting to access the
+ * available behaviors. Specific Java like behaviors are implemented on the
+ * protocols where applicable.
  *
  */
 public interface PyObject
@@ -37,61 +34,18 @@ static PyType type()
     return (PyType) PyBuiltIn.eval("object", null, null);
   }
 
-  /**
-   * Get the type of this object.
-   *
-   * Equivalent of type(obj).
-   *
-   * @return the object type.
-   */
-  PyType getType();
-
-  boolean isInstance(PyObject cls);
-
   /**
    * Apply the attributes protocol to this object.
    *
    * This method never fails.
    *
    * @return an attribute protocol.
    */
-  default PyAttributes asAttributes()
+  default PyAttributes getAttributes()
   {
     return new PyAttributes(this);
   }
 
-  /**
-   * Apply the callable protocol to this object.
-   *
-   * The object must be callable for this to succeed.
-   *
-   * @return a callable protocol.
-   */
-  PyCallable asCallable();
-
-  /**
-   * Apply the sequence protocol to this object.
-   *
-   * @return a sequence protocol.
-   */
-  PySequence asSequence();
-
-  /**
-   * Apply the mapping protocol to this object.
-   *
-   * @return a mapping protocol.
-   */
-  PyMapping asMapping();
-
-  /**
-   * Apply the number protocol to this object.
-   *
-   * @return a number protocol.
-   */
-  PyNumber asNumber();
-
-  PyObject bytes();
-
   @Override
   int hashCode();
 

native/jpype_module/src/main/java/python/lang/PyType.java

@@ -103,7 +103,6 @@ static PyType type()
    * @param obj The object to check.
    * @return True if the object is an instance of this type, false otherwise.
    */
-  @Override
   boolean isInstance(PyObject obj);
 
   /**

native/jpype_module/src/main/java/python/protocol/PyCallable.java

@@ -211,7 +211,7 @@ public CallBuilder arg(Object value)
      * @param values is the arguments to add.
      * @return this {@link CallBuilder} instance for chaining.
      */
-    public CallBuilder arg(Object... values)
+    public CallBuilder args(Object... values)
     {
       jargs.addAll(Arrays.asList(values));
       return this;

native/jpype_module/src/main/java/python/protocol/PyMappingEntrySetIterator.java

@@ -23,6 +23,7 @@
 import org.jpype.bridge.Interpreter;
 import python.lang.PyBuiltIn;
 import python.lang.PyObject;
+import python.lang.PyTuple;
 
 /**
  * Iterator implementation for iterating over the entries of a Python mapping.
@@ -163,7 +164,7 @@ public Map.Entry<K, V> next() throws NoSuchElementException
       throw new NoSuchElementException();
     check = false;
     // The yielded object has two members: key and value
-    PySequence tuple = yield.asSequence();
+    PyTuple tuple = (PyTuple) yield;
     PyObject key = tuple.get(0);
     PyObject value = tuple.get(1);
     return new Utility.MapEntryWithSet(key, value, setter);

native/jpype_module/src/test/java/python/lang/PyByteArrayNGTest.java

@@ -21,7 +21,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import python.protocol.PyBuffer;
-import python.lang.PyBuiltIn;
+import static python.lang.PyBuiltIn.*;
 /**
  *
  * @author nelson85
@@ -52,7 +52,7 @@ public void testCreateWithLength()
     assertNotNull(instance, "PyByteArray object should not be null");
 
     // Optionally, verify the size of the bytearray (if accessible)
-    int len2 = PyBuiltIn.len(instance);
+    int len2 = len(instance);
     assertEquals(len2, length, "PyByteArray size should match the specified length");
   }
 
@@ -143,7 +143,7 @@ public void testSize()
     PyByteArray instance = PyByteArray.create(10);
 
     // Assert that the size of the PyByteArray matches the specified length
-    int len2 = PyBuiltIn.len(instance);
+    int len2 = len(instance);
     assertEquals(len2, 10, "PyByteArray size should match the specified length");
   }
 

native/jpype_module/src/test/java/python/lang/PyDictNGTest.java

@@ -25,6 +25,7 @@
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeClass;
+import static python.lang.PyBuiltIn.*;
 
 /**
  *
@@ -42,10 +43,10 @@ public static void setUpClass() throws Exception
   @Test
   public void testPutAndGet()
   {
-    PyDict dict = PyDict.create();
+    PyDict obj = dict();
     PyObject value = PyString.from("value1");
-    dict.put("key1", value);
-    assertEquals(dict.get("key1"), value);
+    obj.put("key1", value);
+    assertEquals(obj.get("key1"), value);
   }
 
   @Test

native/jpype_module/src/test/java/python/lang/PyTypeNGTest.java

@@ -20,6 +20,7 @@
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeClass;
+import static python.lang.PyBuiltIn.*;
 
 /**
  *
@@ -70,7 +71,7 @@ public void testIsSubclassOf()
   public void testIsInstance()
   {
     PyObject obj = PyString.from("test");
-    PyType type = obj.getType();
+    PyType type = type(obj);
     assertTrue(type.isInstance(obj));
     assertFalse(type.isInstance(PyDict.type()));
   }
@@ -88,7 +89,7 @@ public void testIsAbstract()
     Context context = new Context();
     context.importModule("collections");
     PyObject obj = context.eval("collections.abc.Mapping");
-    PyType type = obj.getType();
+    PyType type = type(obj);
     assertTrue(type.isAbstract());
     PyType concreteType = PyDict.type();
     assertFalse(concreteType.isAbstract());