[Jython-checkins] jython: Implemented feedback from Frank's review on customizable proxymaker

[frank.wierzbicki]

http://hg.python.org/jython/rev/98189c8cc1a1
changeset:   6906:98189c8cc1a1
user:        Darjus Loktevic <darjus at gmail.com>
date:        Fri Oct 12 18:10:48 2012 -0700
summary:
  Implemented feedback from Frank's review on customizable proxymaker

files:
  src/org/python/compiler/ProxyMaker.java                              |   3 ---
  tests/java/org/python/compiler/custom_proxymaker/MiniClampMaker.java |   2 +-
  tests/python/custom_proxymaker/annotated_class.py                    |  10 +++++-----
  3 files changed, 6 insertions(+), 9 deletions(-)


diff --git a/src/org/python/compiler/ProxyMaker.java b/src/org/python/compiler/ProxyMaker.java
--- a/src/org/python/compiler/ProxyMaker.java
+++ b/src/org/python/compiler/ProxyMaker.java
@@ -404,9 +404,6 @@
         code.aload(tmp);
 
         callMethod(code, "<init>", parameters, Void.TYPE, exceptions);
-
-//        addSuperMethod("super__"+name, name, superClass, parameters,
-//                       ret, sig, access);
     }
     
     private String methodString(Method m) {
diff --git a/tests/java/org/python/compiler/custom_proxymaker/MiniClampMaker.java b/tests/java/org/python/compiler/custom_proxymaker/MiniClampMaker.java
--- a/tests/java/org/python/compiler/custom_proxymaker/MiniClampMaker.java
+++ b/tests/java/org/python/compiler/custom_proxymaker/MiniClampMaker.java
@@ -80,7 +80,7 @@
                 methodsToAdd.put(key, clampObj);
             }
         }
-        PyObject pyAnnotations = methods.__finditem__("_class_annotations");
+        PyObject pyAnnotations = methods.__finditem__("_clamp_class_annotations");
         if (pyAnnotations != null) {
             classAnnotations = extractAnnotation((PyDictionary)pyAnnotations);
         }
diff --git a/tests/python/custom_proxymaker/annotated_class.py b/tests/python/custom_proxymaker/annotated_class.py
--- a/tests/python/custom_proxymaker/annotated_class.py
+++ b/tests/python/custom_proxymaker/annotated_class.py
@@ -9,10 +9,10 @@
     __proxymaker__ = MiniClampMaker
     __java_package__ = 'custom_proxymaker.tests'
 
-    _class_annotations = {CustomAnnotation:
-                          {'createdBy': 'Darusik',
-                           'priority': CustomAnnotation.Priority.LOW,
-                           'changedBy': ['Darjus', 'Darjunia']},
-                          Deprecated:None}
+    _clamp_class_annotations = {CustomAnnotation:
+                                {'createdBy': 'Darusik',
+                                 'priority': CustomAnnotation.Priority.LOW,
+                                 'changedBy': ['Darjus', 'Darjunia']},
+                                Deprecated:None}
 
 

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