[Jython-checkins] jython: Formatting changes only, ahead of JSR-233 fix.
jeff.allen
jython-checkins at python.org
Wed Oct 15 00:04:14 CEST 2014
https://hg.python.org/jython/rev/f07614940ab4
changeset: 7399:f07614940ab4
user: Jeff Allen <ja.py at farowl.co.uk>
date: Tue Oct 14 20:03:07 2014 +0100
summary:
Formatting changes only, ahead of JSR-233 fix.
files:
src/org/python/core/adapter/ClassicPyObjectAdapter.java | 182 +++++-----
tests/java/org/python/jsr223/ScriptEngineTest.java | 67 +-
2 files changed, 125 insertions(+), 124 deletions(-)
diff --git a/src/org/python/core/adapter/ClassicPyObjectAdapter.java b/src/org/python/core/adapter/ClassicPyObjectAdapter.java
--- a/src/org/python/core/adapter/ClassicPyObjectAdapter.java
+++ b/src/org/python/core/adapter/ClassicPyObjectAdapter.java
@@ -14,136 +14,136 @@
/**
* Implements the algorithm originally used in {@link Py#java2py} to adapt objects.
*
- * Pre-class adapters are added to handle instances of PyObject, PyProxy and
- * null values. Class adapters are added to handle builtin Java classes: String,
- * Integer, Float, Double, Byte, Long, Short, Character, Class and Boolean. An
- * adapter is added to the post-class adapters to handle wrapping arrays
- * properly. Finally, if all of the added adapters can handle an object, it's
+ * Pre-class adapters are added to handle instances of PyObject, PyProxy and null values. Class
+ * adapters are added to handle builtin Java classes: String, Integer, Float, Double, Byte, Long,
+ * Short, Character, Class and Boolean. An adapter is added to the post-class adapters to handle
+ * wrapping arrays properly. Finally, if all of the added adapters can handle an object, it's
* wrapped in a PyJavaInstance.
*
*/
public class ClassicPyObjectAdapter extends ExtensiblePyObjectAdapter {
- public ClassicPyObjectAdapter() {
- addPreClass(new PyObjectAdapter() {
+ public ClassicPyObjectAdapter() {
+ addPreClass(new PyObjectAdapter() {
- public PyObject adapt(Object o) {
- return (PyObject) o;
- }
+ public PyObject adapt(Object o) {
+ return (PyObject)o;
+ }
- public boolean canAdapt(Object o) {
- return o instanceof PyObject;
- }
- });
- addPreClass(new PyObjectAdapter() {
+ public boolean canAdapt(Object o) {
+ return o instanceof PyObject;
+ }
+ });
+ addPreClass(new PyObjectAdapter() {
- public PyObject adapt(Object o) {
- return ((PyProxy) o)._getPyInstance();
- }
+ public PyObject adapt(Object o) {
+ return ((PyProxy)o)._getPyInstance();
+ }
- public boolean canAdapt(Object o) {
- return o instanceof PyProxy;
- }
- });
- addPreClass(new PyObjectAdapter() {
+ public boolean canAdapt(Object o) {
+ return o instanceof PyProxy;
+ }
+ });
+ addPreClass(new PyObjectAdapter() {
- public boolean canAdapt(Object o) {
- return o == null;
- }
+ public boolean canAdapt(Object o) {
+ return o == null;
+ }
- public PyObject adapt(Object o) {
- return Py.None;
- }
- });
+ public PyObject adapt(Object o) {
+ return Py.None;
+ }
+ });
- add(new ClassAdapter(String.class) {
+ add(new ClassAdapter(String.class) {
- public PyObject adapt(Object o) {
- return new PyUnicode((String) o);
- }
+ public PyObject adapt(Object o) {
+ return new PyUnicode((String)o);
+ }
- });
- add(new ClassAdapter(Character.class) {
+ });
+ add(new ClassAdapter(Character.class) {
- public PyObject adapt(Object o) {
+ public PyObject adapt(Object o) {
return Py.makeCharacter((Character)o);
}
- });
- add(new ClassAdapter(Class.class) {
+ });
+ add(new ClassAdapter(Class.class) {
- public PyObject adapt(Object o) {
+ public PyObject adapt(Object o) {
return PyType.fromClass((Class<?>)o, false);
}
- });
- add(new NumberToPyFloat(Double.class));
- add(new NumberToPyFloat(Float.class));
- add(new NumberToPyInteger(Integer.class));
- add(new NumberToPyInteger(Byte.class));
- add(new NumberToPyInteger(Short.class));
- add(new ClassAdapter(Long.class) {
+ });
+ add(new NumberToPyFloat(Double.class));
+ add(new NumberToPyFloat(Float.class));
+ add(new NumberToPyInteger(Integer.class));
+ add(new NumberToPyInteger(Byte.class));
+ add(new NumberToPyInteger(Short.class));
+ add(new ClassAdapter(Long.class) {
- public PyObject adapt(Object o) {
- return new PyLong(((Number) o).longValue());
- }
+ public PyObject adapt(Object o) {
+ return new PyLong(((Number)o).longValue());
+ }
- });
- add(new ClassAdapter(Boolean.class) {
+ });
+ add(new ClassAdapter(Boolean.class) {
- public PyObject adapt(Object o) {
- return ((Boolean) o).booleanValue() ? Py.True : Py.False;
- }
+ public PyObject adapt(Object o) {
+ return ((Boolean)o).booleanValue() ? Py.True : Py.False;
+ }
- });
- addPostClass(new PyObjectAdapter() {
+ });
+ addPostClass(new PyObjectAdapter() {
- public PyObject adapt(Object o) {
- return new PyArray(o.getClass().getComponentType(), o);
- }
+ public PyObject adapt(Object o) {
+ return new PyArray(o.getClass().getComponentType(), o);
+ }
- public boolean canAdapt(Object o) {
- return o.getClass().isArray();
- }
- });
- }
+ public boolean canAdapt(Object o) {
+ return o.getClass().isArray();
+ }
+ });
+ }
/**
* Always returns true as we just return new PyJavaInstance(o) if the adapters added to the
* superclass can't handle o.
*/
- public boolean canAdapt(Object o) {
- return true;
- }
+ public boolean canAdapt(Object o) {
+ return true;
+ }
- public PyObject adapt(Object o) {
- PyObject result = super.adapt(o);
- if (result != null) {
- return result;
- }
- return PyJavaType.wrapJavaObject(o);
- }
+ public PyObject adapt(Object o) {
+ PyObject result = super.adapt(o);
+ if (result != null) {
+ return result;
+ }
+ return PyJavaType.wrapJavaObject(o);
+ }
- private static class NumberToPyInteger extends ClassAdapter {
+ private static class NumberToPyInteger extends ClassAdapter {
- public NumberToPyInteger(Class c) {
- super(c);
- }
+ public NumberToPyInteger(Class c) {
+ super(c);
+ }
- public PyObject adapt(Object o) {
- return new PyInteger(((Number) o).intValue());
- }
+ public PyObject adapt(Object o) {
+ return new PyInteger(((Number)o).intValue());
+ }
- }
+ }
- private static class NumberToPyFloat extends ClassAdapter {
- public NumberToPyFloat(Class c) {
- super(c);
- }
+ private static class NumberToPyFloat extends ClassAdapter {
- public PyObject adapt(Object o) {
- return new PyFloat(((Number) o).doubleValue());
- }
+ public NumberToPyFloat(Class c) {
+ super(c);
+ }
- }
+ public PyObject adapt(Object o) {
+ return new PyFloat(((Number)o).doubleValue());
+ }
+
+ }
}
diff --git a/tests/java/org/python/jsr223/ScriptEngineTest.java b/tests/java/org/python/jsr223/ScriptEngineTest.java
--- a/tests/java/org/python/jsr223/ScriptEngineTest.java
+++ b/tests/java/org/python/jsr223/ScriptEngineTest.java
@@ -75,7 +75,7 @@
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
- CompiledScript five = ((Compilable) pythonEngine).compile("5");
+ CompiledScript five = ((Compilable)pythonEngine).compile("5");
assertEquals(Integer.valueOf(5), five.eval());
}
@@ -91,7 +91,7 @@
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
- CompiledScript five = ((Compilable) pythonEngine).compile(new StringReader("5"));
+ CompiledScript five = ((Compilable)pythonEngine).compile(new StringReader("5"));
assertEquals(Integer.valueOf(5), five.eval());
}
@@ -117,10 +117,13 @@
this.engine = engine;
}
+ @Override
public void run() {
try {
Bindings bindings = engine.createBindings();
- assertNull(engine.eval("try: a\nexcept NameError: pass\nelse: raise Exception('a is defined', a)", bindings));
+ assertNull(engine.eval(
+ "try: a\nexcept NameError: pass\nelse: raise Exception('a is defined', a)",
+ bindings));
bindings.put("x", -7);
x = engine.eval("x", bindings);
} catch (Throwable e) {
@@ -151,7 +154,7 @@
public void testInvoke() throws ScriptException, NoSuchMethodException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
- Invocable invocableEngine = (Invocable) pythonEngine;
+ Invocable invocableEngine = (Invocable)pythonEngine;
assertNull(pythonEngine.eval("def f(x): return abs(x)"));
assertEquals(Integer.valueOf(5), invocableEngine.invokeFunction("f", Integer.valueOf(-5)));
@@ -161,7 +164,7 @@
public void testInvokeFunctionNoSuchMethod() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
- Invocable invocableEngine = (Invocable) manager.getEngineByName("python");
+ Invocable invocableEngine = (Invocable)manager.getEngineByName("python");
try {
invocableEngine.invokeFunction("undefined");
@@ -173,7 +176,7 @@
public void testInvokeMethodNoSuchMethod() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
- Invocable invocableEngine = (Invocable) manager.getEngineByName("python");
+ Invocable invocableEngine = (Invocable)manager.getEngineByName("python");
try {
invocableEngine.invokeMethod("eggs", "undefined");
@@ -186,15 +189,13 @@
public void testGetInterface() throws ScriptException, IOException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
- Invocable invocableEngine = (Invocable) pythonEngine;
+ Invocable invocableEngine = (Invocable)pythonEngine;
assertNull(pythonEngine.eval("def read(cb): return 1"));
Readable readable = invocableEngine.getInterface(Readable.class);
assertEquals(1, readable.read(null));
- assertNull(pythonEngine.eval(
- "class C(object):\n"
- + " def read(self, cb): return 2\n"
+ assertNull(pythonEngine.eval("class C(object):\n" + " def read(self, cb): return 2\n"
+ "c = C()"));
readable = invocableEngine.getInterface(pythonEngine.get("c"), Readable.class);
assertEquals(2, readable.read(null));
@@ -203,12 +204,12 @@
public void testInvokeMethodNoSuchArgs() throws ScriptException, NoSuchMethodException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
- Invocable invocableEngine = (Invocable) pythonEngine;
+ Invocable invocableEngine = (Invocable)pythonEngine;
Object newStringCapitalize = invocableEngine.invokeMethod("test", "capitalize");
assertEquals(newStringCapitalize, "Test");
}
-
+
public void testPdb() {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
@@ -221,7 +222,7 @@
assertTrue(e.getMessage().startsWith("bdb.BdbQuit"));
}
}
-
+
public void testScope_repr() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
@@ -230,7 +231,7 @@
pythonEngine.eval("localrepr = `locals()`");
assertEquals("{'b': u'hi', 'a': 4}", pythonEngine.get("localrepr"));
}
-
+
public void testScope_iter() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
@@ -241,8 +242,8 @@
pythonEngine.eval("listrepr = `list`");
assertEquals("[u'a', u'b', u'list']", pythonEngine.get("listrepr"));
}
-
- public void testScope_lookup() throws ScriptException{
+
+ public void testScope_lookup() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
pythonEngine.eval("a = 4");
@@ -252,20 +253,20 @@
assertEquals("4", pythonEngine.get("arepr"));
}
- public void testIssue1681() throws ScriptException{
+ public void testIssue1681() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
- pythonEngine.eval("from org.python.jsr223 import PythonCallable\n" +
- "class MyPythonCallable(PythonCallable):\n" +
- " def getAString(self): return 'a string'\n\n" +
- "result = MyPythonCallable().getAString()\n" +
- "test = MyPythonCallable()\n" +
- "result2 = test.getAString()");
+ pythonEngine.eval("from org.python.jsr223 import PythonCallable\n"
+ + "class MyPythonCallable(PythonCallable):\n"
+ + " def getAString(self): return 'a string'\n\n"
+ + "result = MyPythonCallable().getAString()\n" //
+ + "test = MyPythonCallable()\n"
+ + "result2 = test.getAString()");
assertEquals("a string", pythonEngine.get("result"));
assertEquals("a string", pythonEngine.get("result2"));
}
- public void testIssue1698() throws ScriptException{
+ public void testIssue1698() throws ScriptException {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine pythonEngine = manager.getEngineByName("python");
pythonEngine.eval("import warnings");
@@ -281,16 +282,16 @@
}
public void testSiteCanBeNotImported() throws ScriptException {
- try {
- Options.importSite = false;
- ScriptEngineManager manager = new ScriptEngineManager();
- ScriptEngine pythonEngine = manager.getEngineByName("python");
+ try {
+ Options.importSite = false;
+ ScriptEngineManager manager = new ScriptEngineManager();
+ ScriptEngine pythonEngine = manager.getEngineByName("python");
- pythonEngine.eval("import sys");
- pythonEngine.eval("'site' not in sys.modules");
+ pythonEngine.eval("import sys");
+ pythonEngine.eval("'site' not in sys.modules");
} finally {
- Options.importSite = true;
- }
+ Options.importSite = true;
+ }
}
-
+
}
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list