From jython-checkins at python.org  Sat Jan  7 14:15:56 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Sat, 07 Jan 2017 19:15:56 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Fixed_terminology_in_doc_of?=
 =?utf-8?q?_finalizer-stuff=2E?=
Message-ID: <20170107191556.32431.85985.FED25F59@psf.io>

https://hg.python.org/jython/rev/adae7d83b71e
changeset:   7986:adae7d83b71e
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Sat Jan 07 20:15:31 2017 +0100
summary:
  Fixed terminology in doc of finalizer-stuff.

files:
  src/org/python/core/TraverseprocDerived.java                     |   2 +-
  src/org/python/core/finalization/FinalizableBuiltin.java         |   2 +-
  src/org/python/core/finalization/FinalizablePyObject.java        |  10 +++++-----
  src/org/python/core/finalization/FinalizablePyObjectDerived.java |   2 +-
  4 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/src/org/python/core/TraverseprocDerived.java b/src/org/python/core/TraverseprocDerived.java
--- a/src/org/python/core/TraverseprocDerived.java
+++ b/src/org/python/core/TraverseprocDerived.java
@@ -5,7 +5,7 @@
  * but traverses only the {@code slots[]}-array of
  * {@code fooDerived}-classes. This way we avoid that the traverse
  * method of a traversable {@link org.python.core.PyObject} is
- * overwritten by the derived version.
+ * overridden by the derived version.
  * {@link org.python.modules.gc#traverse(PyObject, Visitproc, Object)} takes care of
  * exploiting both traverse methods.
  */
diff --git a/src/org/python/core/finalization/FinalizableBuiltin.java b/src/org/python/core/finalization/FinalizableBuiltin.java
--- a/src/org/python/core/finalization/FinalizableBuiltin.java
+++ b/src/org/python/core/finalization/FinalizableBuiltin.java
@@ -12,7 +12,7 @@
      * A FinalizeTrigger calls {@link FinalizablePyObjectDerived#__del_derived__()}
      * first and - if existent - {@link #__del_builtin__()} after that. A plain
      * {@link FinalizablePyObject#__del__()}
-     * would behave as overwritten by
+     * would behave as overridden by
      * {@link FinalizablePyObjectDerived#__del_derived__()}, i.e. won't be called
      * if the type implements {@link FinalizablePyObjectDerived}, while
      * {@link #__del_builtin__()} is called in any case.
diff --git a/src/org/python/core/finalization/FinalizablePyObject.java b/src/org/python/core/finalization/FinalizablePyObject.java
--- a/src/org/python/core/finalization/FinalizablePyObject.java
+++ b/src/org/python/core/finalization/FinalizablePyObject.java
@@ -7,7 +7,7 @@
  * {@link org.python.core.finalization.FinalizableBuiltin}.
  * </p>
  * <p>
- * The difference is that {@link #__del__()} can be overwritten by a
+ * The difference is that {@link #__del__()} can be overridden by a
  * new-style subclass's {@code __del__}-method on Python-side, while
  * {@link FinalizableBuiltin#__del_builtin__()} is always called.
  * If a Python-side finalizer exists,
@@ -20,7 +20,7 @@
  * call {@link #__del__()} first and then
  * {@link FinalizableBuiltin#__del_builtin__()}. If a
  * new-style subclass has an own, Python-side {@code __del__}-method, this
- * overwrites the Java-implemented {@link #__del__()}, but not
+ * overrides the Java-implemented {@link #__del__()}, but not
  * {@link FinalizableBuiltin#__del_builtin__()}, which will be called after
  * the Python-side finalizer.
  * </p>
@@ -76,9 +76,9 @@
  * implementations.
  * </p>
  * <p>
- * Note that it is not possible to overwrite {@code __ensure_finalizer__} on Python side.
- * If one overwrites {@code __ensure_finalizer__} on Python side, Jython will ignore the
- * overwrite-implementation and still call the original one.
+ * Note that it is not possible to override {@code __ensure_finalizer__} on Python side.
+ * If one overrides {@code __ensure_finalizer__} on Python side, Jython will ignore the
+ * override-implementation and still call the original one.
  * </p>
  * <p>
  * It is possible to switch finalization on and off at any desired time for a certain object.
diff --git a/src/org/python/core/finalization/FinalizablePyObjectDerived.java b/src/org/python/core/finalization/FinalizablePyObjectDerived.java
--- a/src/org/python/core/finalization/FinalizablePyObjectDerived.java
+++ b/src/org/python/core/finalization/FinalizablePyObjectDerived.java
@@ -16,7 +16,7 @@
      * {@code __del_derived__} refers to an instance's in-dict {@code __del__}.
      * A FinalizeTrigger calls {@code __del_derived__} first and
      * - if existent - {@code __del_builtin__} after that. A plain {@code __del__}
-     * would behave as overwritten by {@code __del_derived__}, i.e. won't be called
+     * would behave as overridden by {@code __del_derived__}, i.e. won't be called
      * if the type implements {@code FinalizablePyObjectDerived} while
      * {@code __del_builtin__} is called in any case.
      */

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

From jython-checkins at python.org  Sun Jan  8 09:18:27 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Sun, 08 Jan 2017 14:18:27 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Improved_dummy_implementati?=
 =?utf-8?q?on_of_unsupported_variant_of_JavaCode=2Ecall=2E?=
Message-ID: <20170108141826.93140.97637.A3CEBA93@psf.io>

https://hg.python.org/jython/rev/5f90bba90482
changeset:   7987:5f90bba90482
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Sun Jan 08 15:18:04 2017 +0100
summary:
  Improved dummy implementation of unsupported variant of JavaCode.call.

files:
  src/org/python/core/Py.java |  11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/src/org/python/core/Py.java b/src/org/python/core/Py.java
--- a/src/org/python/core/Py.java
+++ b/src/org/python/core/Py.java
@@ -2714,9 +2714,14 @@
 
     @Override
     public PyObject call(ThreadState state, PyFrame frame, PyObject closure) {
-        //XXX: what the heck is this?  Looks like debug code, but it's
-        //     been here a long time...
-        System.out.println("call #1");
+        /* This should actually
+         *     throw new UnsupportedOperationException(
+         *             "JavaCode doesn't support call with signature "+
+         *             "(ThreadState state, PyFrame frame, PyObject closure).");
+         * However since this would be an API-change, for 2.7 series we just warn.
+         */
+        Py.warning(Py.RuntimeWarning, "JavaCode doesn't support call with signature "+
+                "(ThreadState state, PyFrame frame, PyObject closure).");
         return Py.None;
     }
 

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

From jython-checkins at python.org  Sun Jan  8 11:40:38 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Sun, 08 Jan 2017 16:40:38 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Changed_potential_debug-out?=
 =?utf-8?q?put_in_PyType=2Elookup=5Fwhere_to_a_proper_warning=2E_Can?=
Message-ID: <20170108164035.92885.74460.7A3E8B30@psf.io>

https://hg.python.org/jython/rev/d143b5fbb0ff
changeset:   7988:d143b5fbb0ff
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Sun Jan 08 17:40:25 2017 +0100
summary:
  Changed potential debug-output in PyType.lookup_where to a proper warning. Can we even turn it into an assert? Or would that crash unnecessarily under some circumstances?

files:
  src/org/python/core/PyType.java |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/src/org/python/core/PyType.java b/src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java
+++ b/src/org/python/core/PyType.java
@@ -1243,7 +1243,12 @@
      * @return found object or null
      */
     public PyObject lookup_where(String name, PyObject[] where) {
-    	if (methodCache == null) System.out.println("method cache is null");
+        /* Can we even switch to an assert here?
+         * assert methodCache != null;
+         */
+        if (methodCache == null) {
+            Py.warning(Py.RuntimeWarning, "PyType: methodCache is null");
+        }
         return methodCache.lookup_where(this, name, where);
     }
 

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

From jython-checkins at python.org  Sun Jan  8 14:28:37 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Sun, 08 Jan 2017 19:28:37 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Applied_AbstractDict-unific?=
 =?utf-8?q?ation_of_PyDictionary_and_PyStringMap_in_PyType_and?=
Message-ID: <20170108192837.15640.32589.58607D3C@psf.io>

https://hg.python.org/jython/rev/1b850db5f437
changeset:   7989:1b850db5f437
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Sun Jan 08 20:28:24 2017 +0100
summary:
  Applied AbstractDict-unification of PyDictionary and PyStringMap in PyType and TypeBuilder. Specified Class generic-parameters in TypeBuilder and BaseTypeBuilder. Added various @Override annotations.

files:
  src/org/python/core/PyType.java                   |  21 ++++-----
  src/org/python/expose/BaseTypeBuilder.java        |  17 +++++--
  src/org/python/expose/TypeBuilder.java            |   7 +-
  src/org/python/expose/generate/Exposer.java       |   2 +-
  src/org/python/expose/generate/MethodExposer.java |   2 +-
  src/org/python/expose/generate/TypeExposer.java   |   2 +-
  6 files changed, 28 insertions(+), 23 deletions(-)


diff --git a/src/org/python/core/PyType.java b/src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java
+++ b/src/org/python/core/PyType.java
@@ -47,7 +47,7 @@
     protected PyObject[] bases = new PyObject[0];
 
     /** The real, internal __dict__. */
-    protected PyObject dict;
+    protected AbstractDict dict;
 
     /** __mro__, the method resolution. order */
     protected PyObject[] mro;
@@ -137,9 +137,9 @@
 
         ArgParser ap = new ArgParser("type()", args, keywords, "name", "bases", "dict");
         String name = ap.getString(0);
-        PyTuple bases = (PyTuple)ap.getPyObjectByType(1, PyTuple.TYPE);
+        PyTuple bases = (PyTuple) ap.getPyObjectByType(1, PyTuple.TYPE);
         PyObject dict = ap.getPyObject(2);
-        if (!(dict instanceof PyDictionary || dict instanceof PyStringMap)) {
+        if (!(dict instanceof AbstractDict)) {
             throw Py.TypeError("type(): argument 3 must be dict, not " + dict.getType());
         }
         return newType(new_, subtype, name, bases, dict);
@@ -186,15 +186,10 @@
             type = new PyTypeDerived(metatype);
         }
 
-        if (dict instanceof PyStringMap) {
-            dict = ((PyStringMap)dict).copy();
-        } else {
-            dict = ((PyDictionary)dict).copy();
-        }
-
+        dict = ((AbstractDict) dict).copy();
         type.name = name;
         type.bases = tmpBases.length == 0 ? new PyObject[] {PyObject.TYPE} : tmpBases;
-        type.dict = dict;
+        type.dict = (AbstractDict) dict;
         type.tp_flags = Py.TPFLAGS_HEAPTYPE | Py.TPFLAGS_BASETYPE;
         // Enable defining a custom __dict__ via a property, method, or other descriptor
         boolean defines_dict = dict.__finditem__("__dict__") != null;
@@ -896,7 +891,7 @@
         }
     }
 
-    public PyObject instDict() {
+    public PyStringMap instDict() {
         if (needs_userdict) {
             return new PyStringMap();
         }
@@ -1758,11 +1753,13 @@
      * Returns the actual dict underlying this type instance. Changes to Java types should go
      * through {@link #addMethod} and {@link #removeMethod}, or unexpected mro errors can occur.
      */
-    public PyObject fastGetDict() {
+    @Override
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
     @ExposedGet(name = "__dict__")
+    @Override
     public PyObject getDict() {
         return new PyDictProxy(dict);
     }
diff --git a/src/org/python/expose/BaseTypeBuilder.java b/src/org/python/expose/BaseTypeBuilder.java
--- a/src/org/python/expose/BaseTypeBuilder.java
+++ b/src/org/python/expose/BaseTypeBuilder.java
@@ -6,6 +6,7 @@
 import org.python.core.PyNewWrapper;
 import org.python.core.PyObject;
 import org.python.core.PyStringMap;
+import org.python.core.AbstractDict;
 import org.python.core.PyType;
 
 public class BaseTypeBuilder implements TypeBuilder {
@@ -16,7 +17,7 @@
 
     private PyDataDescr[] descrs;
 
-    private Class<?> typeClass;
+    private Class<? extends PyObject> typeClass;
 
     private Class<?> baseClass;
 
@@ -27,7 +28,7 @@
     private String doc;
 
     public BaseTypeBuilder(String name,
-                           Class<?> typeClass,
+                           Class<? extends PyObject> typeClass,
                            Class<?> baseClass,
                            boolean isBaseType,
                            String doc,
@@ -44,8 +45,9 @@
         this.newWrapper = newWrapper;
     }
 
-    public PyObject getDict(PyType type) {
-        PyObject dict = new PyStringMap();
+    @Override
+    public PyStringMap getDict(PyType type) {
+        PyStringMap dict = new PyStringMap();
         for(PyBuiltinMethod func : meths) {
             PyMethodDescr pmd = func.makeDescriptor(type);
             dict.__setitem__(pmd.getName(), pmd);
@@ -61,22 +63,27 @@
         return dict;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
-    public Class<?> getTypeClass() {
+    @Override
+    public Class<? extends PyObject> getTypeClass() {
         return typeClass;
     }
 
+    @Override
     public Class<?> getBase() {
         return baseClass;
     }
 
+    @Override
     public boolean getIsBaseType() {
         return isBaseType;
     }
 
+    @Override
     public String getDoc() {
         return doc;
     }
diff --git a/src/org/python/expose/TypeBuilder.java b/src/org/python/expose/TypeBuilder.java
--- a/src/org/python/expose/TypeBuilder.java
+++ b/src/org/python/expose/TypeBuilder.java
@@ -1,6 +1,7 @@
 package org.python.expose;
 
 import org.python.core.PyObject;
+import org.python.core.AbstractDict;
 import org.python.core.PyType;
 
 /**
@@ -10,11 +11,11 @@
 
     public String getName();
 
-    public PyObject getDict(PyType type);
+    public AbstractDict getDict(PyType type);
 
-    public Class getTypeClass();
+    public Class<? extends PyObject> getTypeClass();
 
-    public Class getBase();
+    public Class<?> getBase();
 
     public boolean getIsBaseType();
 
diff --git a/src/org/python/expose/generate/Exposer.java b/src/org/python/expose/generate/Exposer.java
--- a/src/org/python/expose/generate/Exposer.java
+++ b/src/org/python/expose/generate/Exposer.java
@@ -53,7 +53,7 @@
      * @param generatedName -
      *            the name of the class to generate
      */
-    public Exposer(Class superClass, String generatedName, Type...interfacesImplemented) {
+    public Exposer(Class<?> superClass, String generatedName, Type...interfacesImplemented) {
         superType = Type.getType(superClass);
         thisType = Type.getType("L" + generatedName.replace('.', '/') + ";");
         this.interfacesImplemented = interfacesImplemented;
diff --git a/src/org/python/expose/generate/MethodExposer.java b/src/org/python/expose/generate/MethodExposer.java
--- a/src/org/python/expose/generate/MethodExposer.java
+++ b/src/org/python/expose/generate/MethodExposer.java
@@ -25,7 +25,7 @@
                          String typeName,
                          String[] asNames,
                          String[] defaults,
-                         Class superClass,
+                         Class<?> superClass,
                          String doc) {
         super(superClass, onType.getClassName() + "$" + methodName + "_exposer");
         this.onType = onType;
diff --git a/src/org/python/expose/generate/TypeExposer.java b/src/org/python/expose/generate/TypeExposer.java
--- a/src/org/python/expose/generate/TypeExposer.java
+++ b/src/org/python/expose/generate/TypeExposer.java
@@ -88,7 +88,7 @@
         for(MethodExposer me : methods) {
             me.load(l);
         }
-        Class descriptor = load(l);
+        Class<?> descriptor = load(l);
         try {
             return (TypeBuilder)descriptor.newInstance();
         } catch(Exception e) {

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

From jython-checkins at python.org  Sun Jan  8 17:33:53 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Sun, 08 Jan 2017 22:33:53 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Applied_AbstractDict-unific?=
 =?utf-8?q?ation_of_PyDictionary_and_PyStringMap_on_derived?=
Message-ID: <20170108223353.52524.74712.FB504487@psf.io>

https://hg.python.org/jython/rev/2a39a4b380b7
changeset:   7990:2a39a4b380b7
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Sun Jan 08 23:33:40 2017 +0100
summary:
  Applied AbstractDict-unification of PyDictionary and PyStringMap on derived classes.

files:
  src/org/python/antlr/ast/AssertDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/AssignDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/AttributeDerived.java                           |  10 ++++----
  src/org/python/antlr/ast/AugAssignDerived.java                           |  10 ++++----
  src/org/python/antlr/ast/BinOpDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/BoolOpDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/BreakDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/CallDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/ClassDefDerived.java                            |  10 ++++----
  src/org/python/antlr/ast/CompareDerived.java                             |  10 ++++----
  src/org/python/antlr/ast/ContinueDerived.java                            |  10 ++++----
  src/org/python/antlr/ast/DeleteDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/DictDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/EllipsisDerived.java                            |  10 ++++----
  src/org/python/antlr/ast/ExceptHandlerDerived.java                       |  10 ++++----
  src/org/python/antlr/ast/ExecDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/ExprDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/ExpressionDerived.java                          |  10 ++++----
  src/org/python/antlr/ast/ExtSliceDerived.java                            |  10 ++++----
  src/org/python/antlr/ast/ForDerived.java                                 |  10 ++++----
  src/org/python/antlr/ast/FunctionDefDerived.java                         |  10 ++++----
  src/org/python/antlr/ast/GeneratorExpDerived.java                        |  10 ++++----
  src/org/python/antlr/ast/GlobalDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/IfDerived.java                                  |  10 ++++----
  src/org/python/antlr/ast/IfExpDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/ImportDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/ImportFromDerived.java                          |  10 ++++----
  src/org/python/antlr/ast/IndexDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/InteractiveDerived.java                         |  10 ++++----
  src/org/python/antlr/ast/LambdaDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/ListCompDerived.java                            |  10 ++++----
  src/org/python/antlr/ast/ListDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/ModuleDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/NameDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/NumDerived.java                                 |  10 ++++----
  src/org/python/antlr/ast/PassDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/PrintDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/RaiseDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/ReprDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/ReturnDerived.java                              |  10 ++++----
  src/org/python/antlr/ast/SliceDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/StrDerived.java                                 |  10 ++++----
  src/org/python/antlr/ast/SubscriptDerived.java                           |  10 ++++----
  src/org/python/antlr/ast/SuiteDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/TryExceptDerived.java                           |  10 ++++----
  src/org/python/antlr/ast/TryFinallyDerived.java                          |  10 ++++----
  src/org/python/antlr/ast/TupleDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/UnaryOpDerived.java                             |  10 ++++----
  src/org/python/antlr/ast/WhileDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/WithDerived.java                                |  10 ++++----
  src/org/python/antlr/ast/YieldDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/aliasDerived.java                               |  10 ++++----
  src/org/python/antlr/ast/argumentsDerived.java                           |  10 ++++----
  src/org/python/antlr/ast/comprehensionDerived.java                       |  10 ++++----
  src/org/python/antlr/ast/keywordDerived.java                             |  10 ++++----
  src/org/python/antlr/op/AddDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/AndDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/AugLoadDerived.java                              |  10 ++++----
  src/org/python/antlr/op/AugStoreDerived.java                             |  10 ++++----
  src/org/python/antlr/op/BitAndDerived.java                               |  10 ++++----
  src/org/python/antlr/op/BitOrDerived.java                                |  10 ++++----
  src/org/python/antlr/op/BitXorDerived.java                               |  10 ++++----
  src/org/python/antlr/op/DelDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/DivDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/EqDerived.java                                   |  10 ++++----
  src/org/python/antlr/op/FloorDivDerived.java                             |  10 ++++----
  src/org/python/antlr/op/GtDerived.java                                   |  10 ++++----
  src/org/python/antlr/op/GtEDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/InDerived.java                                   |  10 ++++----
  src/org/python/antlr/op/InvertDerived.java                               |  10 ++++----
  src/org/python/antlr/op/IsDerived.java                                   |  10 ++++----
  src/org/python/antlr/op/IsNotDerived.java                                |  10 ++++----
  src/org/python/antlr/op/LShiftDerived.java                               |  10 ++++----
  src/org/python/antlr/op/LoadDerived.java                                 |  10 ++++----
  src/org/python/antlr/op/LtDerived.java                                   |  10 ++++----
  src/org/python/antlr/op/LtEDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/ModDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/MultDerived.java                                 |  10 ++++----
  src/org/python/antlr/op/NotDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/NotEqDerived.java                                |  10 ++++----
  src/org/python/antlr/op/NotInDerived.java                                |  10 ++++----
  src/org/python/antlr/op/OrDerived.java                                   |  10 ++++----
  src/org/python/antlr/op/ParamDerived.java                                |  10 ++++----
  src/org/python/antlr/op/PowDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/RShiftDerived.java                               |  10 ++++----
  src/org/python/antlr/op/StoreDerived.java                                |  10 ++++----
  src/org/python/antlr/op/SubDerived.java                                  |  10 ++++----
  src/org/python/antlr/op/UAddDerived.java                                 |  10 ++++----
  src/org/python/antlr/op/USubDerived.java                                 |  10 ++++----
  src/org/python/core/PyArrayDerived.java                                  |  10 ++++----
  src/org/python/core/PyByteArrayDerived.java                              |  10 ++++----
  src/org/python/core/PyClassMethodDerived.java                            |  10 ++++----
  src/org/python/core/PyComplexDerived.java                                |  10 ++++----
  src/org/python/core/PyDictionaryDerived.java                             |  10 ++++----
  src/org/python/core/PyEnumerateDerived.java                              |  10 ++++----
  src/org/python/core/PyFileDerived.java                                   |  10 ++++----
  src/org/python/core/PyFloatDerived.java                                  |  10 ++++----
  src/org/python/core/PyFrozenSetDerived.java                              |  10 ++++----
  src/org/python/core/PyIntegerDerived.java                                |  10 ++++----
  src/org/python/core/PyListDerived.java                                   |  10 ++++----
  src/org/python/core/PyLongDerived.java                                   |  10 ++++----
  src/org/python/core/PyObjectDerived.java                                 |  10 ++++----
  src/org/python/core/PyPropertyDerived.java                               |  10 ++++----
  src/org/python/core/PySetDerived.java                                    |  10 ++++----
  src/org/python/core/PyStringDerived.java                                 |  10 ++++----
  src/org/python/core/PySuperDerived.java                                  |  10 ++++----
  src/org/python/core/PyTupleDerived.java                                  |  10 ++++----
  src/org/python/core/PyUnicodeDerived.java                                |  10 ++++----
  src/org/python/modules/PyStructDerived.java                              |  10 ++++----
  src/org/python/modules/_collections/PyDefaultDictDerived.java            |  10 ++++----
  src/org/python/modules/_collections/PyDequeDerived.java                  |  10 ++++----
  src/org/python/modules/_functools/PyPartialDerived.java                  |  10 ++++----
  src/org/python/modules/_weakref/ReferenceTypeDerived.java                |  10 ++++----
  src/org/python/modules/bz2/PyBZ2CompressorDerived.java                   |  10 ++++----
  src/org/python/modules/bz2/PyBZ2DecompressorDerived.java                 |  10 ++++----
  src/org/python/modules/bz2/PyBZ2FileDerived.java                         |  10 ++++----
  src/org/python/modules/itertools/PyTeeIteratorDerived.java               |  10 ++++----
  src/org/python/modules/itertools/chainDerived.java                       |  10 ++++----
  src/org/python/modules/itertools/combinationsDerived.java                |  10 ++++----
  src/org/python/modules/itertools/combinationsWithReplacementDerived.java |  10 ++++----
  src/org/python/modules/itertools/compressDerived.java                    |  10 ++++----
  src/org/python/modules/itertools/countDerived.java                       |  10 ++++----
  src/org/python/modules/itertools/cycleDerived.java                       |  10 ++++----
  src/org/python/modules/itertools/dropwhileDerived.java                   |  10 ++++----
  src/org/python/modules/itertools/groupbyDerived.java                     |  10 ++++----
  src/org/python/modules/itertools/ifilterDerived.java                     |  10 ++++----
  src/org/python/modules/itertools/ifilterfalseDerived.java                |  10 ++++----
  src/org/python/modules/itertools/isliceDerived.java                      |  10 ++++----
  src/org/python/modules/itertools/izipDerived.java                        |  10 ++++----
  src/org/python/modules/itertools/izipLongestDerived.java                 |  10 ++++----
  src/org/python/modules/itertools/permutationsDerived.java                |  10 ++++----
  src/org/python/modules/itertools/productDerived.java                     |  10 ++++----
  src/org/python/modules/itertools/repeatDerived.java                      |  10 ++++----
  src/org/python/modules/itertools/starmapDerived.java                     |  10 ++++----
  src/org/python/modules/itertools/takewhileDerived.java                   |  10 ++++----
  src/org/python/modules/random/PyRandomDerived.java                       |  10 ++++----
  src/org/python/modules/zipimport/zipimporterDerived.java                 |  10 ++++----
  src/templates/gderived-defs                                              |  12 +++++-----
  138 files changed, 691 insertions(+), 691 deletions(-)


diff --git a/src/org/python/antlr/ast/AssertDerived.java b/src/org/python/antlr/ast/AssertDerived.java
--- a/src/org/python/antlr/ast/AssertDerived.java
+++ b/src/org/python/antlr/ast/AssertDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/AssignDerived.java b/src/org/python/antlr/ast/AssignDerived.java
--- a/src/org/python/antlr/ast/AssignDerived.java
+++ b/src/org/python/antlr/ast/AssignDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/AttributeDerived.java b/src/org/python/antlr/ast/AttributeDerived.java
--- a/src/org/python/antlr/ast/AttributeDerived.java
+++ b/src/org/python/antlr/ast/AttributeDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/AugAssignDerived.java b/src/org/python/antlr/ast/AugAssignDerived.java
--- a/src/org/python/antlr/ast/AugAssignDerived.java
+++ b/src/org/python/antlr/ast/AugAssignDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/BinOpDerived.java b/src/org/python/antlr/ast/BinOpDerived.java
--- a/src/org/python/antlr/ast/BinOpDerived.java
+++ b/src/org/python/antlr/ast/BinOpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/BoolOpDerived.java b/src/org/python/antlr/ast/BoolOpDerived.java
--- a/src/org/python/antlr/ast/BoolOpDerived.java
+++ b/src/org/python/antlr/ast/BoolOpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/BreakDerived.java b/src/org/python/antlr/ast/BreakDerived.java
--- a/src/org/python/antlr/ast/BreakDerived.java
+++ b/src/org/python/antlr/ast/BreakDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/CallDerived.java b/src/org/python/antlr/ast/CallDerived.java
--- a/src/org/python/antlr/ast/CallDerived.java
+++ b/src/org/python/antlr/ast/CallDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ClassDefDerived.java b/src/org/python/antlr/ast/ClassDefDerived.java
--- a/src/org/python/antlr/ast/ClassDefDerived.java
+++ b/src/org/python/antlr/ast/ClassDefDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/CompareDerived.java b/src/org/python/antlr/ast/CompareDerived.java
--- a/src/org/python/antlr/ast/CompareDerived.java
+++ b/src/org/python/antlr/ast/CompareDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ContinueDerived.java b/src/org/python/antlr/ast/ContinueDerived.java
--- a/src/org/python/antlr/ast/ContinueDerived.java
+++ b/src/org/python/antlr/ast/ContinueDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/DeleteDerived.java b/src/org/python/antlr/ast/DeleteDerived.java
--- a/src/org/python/antlr/ast/DeleteDerived.java
+++ b/src/org/python/antlr/ast/DeleteDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/DictDerived.java b/src/org/python/antlr/ast/DictDerived.java
--- a/src/org/python/antlr/ast/DictDerived.java
+++ b/src/org/python/antlr/ast/DictDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/EllipsisDerived.java b/src/org/python/antlr/ast/EllipsisDerived.java
--- a/src/org/python/antlr/ast/EllipsisDerived.java
+++ b/src/org/python/antlr/ast/EllipsisDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExceptHandlerDerived.java b/src/org/python/antlr/ast/ExceptHandlerDerived.java
--- a/src/org/python/antlr/ast/ExceptHandlerDerived.java
+++ b/src/org/python/antlr/ast/ExceptHandlerDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExecDerived.java b/src/org/python/antlr/ast/ExecDerived.java
--- a/src/org/python/antlr/ast/ExecDerived.java
+++ b/src/org/python/antlr/ast/ExecDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExprDerived.java b/src/org/python/antlr/ast/ExprDerived.java
--- a/src/org/python/antlr/ast/ExprDerived.java
+++ b/src/org/python/antlr/ast/ExprDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExpressionDerived.java b/src/org/python/antlr/ast/ExpressionDerived.java
--- a/src/org/python/antlr/ast/ExpressionDerived.java
+++ b/src/org/python/antlr/ast/ExpressionDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExtSliceDerived.java b/src/org/python/antlr/ast/ExtSliceDerived.java
--- a/src/org/python/antlr/ast/ExtSliceDerived.java
+++ b/src/org/python/antlr/ast/ExtSliceDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ForDerived.java b/src/org/python/antlr/ast/ForDerived.java
--- a/src/org/python/antlr/ast/ForDerived.java
+++ b/src/org/python/antlr/ast/ForDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/FunctionDefDerived.java b/src/org/python/antlr/ast/FunctionDefDerived.java
--- a/src/org/python/antlr/ast/FunctionDefDerived.java
+++ b/src/org/python/antlr/ast/FunctionDefDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/GeneratorExpDerived.java b/src/org/python/antlr/ast/GeneratorExpDerived.java
--- a/src/org/python/antlr/ast/GeneratorExpDerived.java
+++ b/src/org/python/antlr/ast/GeneratorExpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/GlobalDerived.java b/src/org/python/antlr/ast/GlobalDerived.java
--- a/src/org/python/antlr/ast/GlobalDerived.java
+++ b/src/org/python/antlr/ast/GlobalDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/IfDerived.java b/src/org/python/antlr/ast/IfDerived.java
--- a/src/org/python/antlr/ast/IfDerived.java
+++ b/src/org/python/antlr/ast/IfDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/IfExpDerived.java b/src/org/python/antlr/ast/IfExpDerived.java
--- a/src/org/python/antlr/ast/IfExpDerived.java
+++ b/src/org/python/antlr/ast/IfExpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ImportDerived.java b/src/org/python/antlr/ast/ImportDerived.java
--- a/src/org/python/antlr/ast/ImportDerived.java
+++ b/src/org/python/antlr/ast/ImportDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ImportFromDerived.java b/src/org/python/antlr/ast/ImportFromDerived.java
--- a/src/org/python/antlr/ast/ImportFromDerived.java
+++ b/src/org/python/antlr/ast/ImportFromDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/IndexDerived.java b/src/org/python/antlr/ast/IndexDerived.java
--- a/src/org/python/antlr/ast/IndexDerived.java
+++ b/src/org/python/antlr/ast/IndexDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/InteractiveDerived.java b/src/org/python/antlr/ast/InteractiveDerived.java
--- a/src/org/python/antlr/ast/InteractiveDerived.java
+++ b/src/org/python/antlr/ast/InteractiveDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/LambdaDerived.java b/src/org/python/antlr/ast/LambdaDerived.java
--- a/src/org/python/antlr/ast/LambdaDerived.java
+++ b/src/org/python/antlr/ast/LambdaDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ListCompDerived.java b/src/org/python/antlr/ast/ListCompDerived.java
--- a/src/org/python/antlr/ast/ListCompDerived.java
+++ b/src/org/python/antlr/ast/ListCompDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ListDerived.java b/src/org/python/antlr/ast/ListDerived.java
--- a/src/org/python/antlr/ast/ListDerived.java
+++ b/src/org/python/antlr/ast/ListDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ModuleDerived.java b/src/org/python/antlr/ast/ModuleDerived.java
--- a/src/org/python/antlr/ast/ModuleDerived.java
+++ b/src/org/python/antlr/ast/ModuleDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/NameDerived.java b/src/org/python/antlr/ast/NameDerived.java
--- a/src/org/python/antlr/ast/NameDerived.java
+++ b/src/org/python/antlr/ast/NameDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/NumDerived.java b/src/org/python/antlr/ast/NumDerived.java
--- a/src/org/python/antlr/ast/NumDerived.java
+++ b/src/org/python/antlr/ast/NumDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/PassDerived.java b/src/org/python/antlr/ast/PassDerived.java
--- a/src/org/python/antlr/ast/PassDerived.java
+++ b/src/org/python/antlr/ast/PassDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/PrintDerived.java b/src/org/python/antlr/ast/PrintDerived.java
--- a/src/org/python/antlr/ast/PrintDerived.java
+++ b/src/org/python/antlr/ast/PrintDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/RaiseDerived.java b/src/org/python/antlr/ast/RaiseDerived.java
--- a/src/org/python/antlr/ast/RaiseDerived.java
+++ b/src/org/python/antlr/ast/RaiseDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ReprDerived.java b/src/org/python/antlr/ast/ReprDerived.java
--- a/src/org/python/antlr/ast/ReprDerived.java
+++ b/src/org/python/antlr/ast/ReprDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ReturnDerived.java b/src/org/python/antlr/ast/ReturnDerived.java
--- a/src/org/python/antlr/ast/ReturnDerived.java
+++ b/src/org/python/antlr/ast/ReturnDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/SliceDerived.java b/src/org/python/antlr/ast/SliceDerived.java
--- a/src/org/python/antlr/ast/SliceDerived.java
+++ b/src/org/python/antlr/ast/SliceDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/StrDerived.java b/src/org/python/antlr/ast/StrDerived.java
--- a/src/org/python/antlr/ast/StrDerived.java
+++ b/src/org/python/antlr/ast/StrDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/SubscriptDerived.java b/src/org/python/antlr/ast/SubscriptDerived.java
--- a/src/org/python/antlr/ast/SubscriptDerived.java
+++ b/src/org/python/antlr/ast/SubscriptDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/SuiteDerived.java b/src/org/python/antlr/ast/SuiteDerived.java
--- a/src/org/python/antlr/ast/SuiteDerived.java
+++ b/src/org/python/antlr/ast/SuiteDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/TryExceptDerived.java b/src/org/python/antlr/ast/TryExceptDerived.java
--- a/src/org/python/antlr/ast/TryExceptDerived.java
+++ b/src/org/python/antlr/ast/TryExceptDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/TryFinallyDerived.java b/src/org/python/antlr/ast/TryFinallyDerived.java
--- a/src/org/python/antlr/ast/TryFinallyDerived.java
+++ b/src/org/python/antlr/ast/TryFinallyDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/TupleDerived.java b/src/org/python/antlr/ast/TupleDerived.java
--- a/src/org/python/antlr/ast/TupleDerived.java
+++ b/src/org/python/antlr/ast/TupleDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/UnaryOpDerived.java b/src/org/python/antlr/ast/UnaryOpDerived.java
--- a/src/org/python/antlr/ast/UnaryOpDerived.java
+++ b/src/org/python/antlr/ast/UnaryOpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/WhileDerived.java b/src/org/python/antlr/ast/WhileDerived.java
--- a/src/org/python/antlr/ast/WhileDerived.java
+++ b/src/org/python/antlr/ast/WhileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/WithDerived.java b/src/org/python/antlr/ast/WithDerived.java
--- a/src/org/python/antlr/ast/WithDerived.java
+++ b/src/org/python/antlr/ast/WithDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/YieldDerived.java b/src/org/python/antlr/ast/YieldDerived.java
--- a/src/org/python/antlr/ast/YieldDerived.java
+++ b/src/org/python/antlr/ast/YieldDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/aliasDerived.java b/src/org/python/antlr/ast/aliasDerived.java
--- a/src/org/python/antlr/ast/aliasDerived.java
+++ b/src/org/python/antlr/ast/aliasDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/argumentsDerived.java b/src/org/python/antlr/ast/argumentsDerived.java
--- a/src/org/python/antlr/ast/argumentsDerived.java
+++ b/src/org/python/antlr/ast/argumentsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/comprehensionDerived.java b/src/org/python/antlr/ast/comprehensionDerived.java
--- a/src/org/python/antlr/ast/comprehensionDerived.java
+++ b/src/org/python/antlr/ast/comprehensionDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/keywordDerived.java b/src/org/python/antlr/ast/keywordDerived.java
--- a/src/org/python/antlr/ast/keywordDerived.java
+++ b/src/org/python/antlr/ast/keywordDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AddDerived.java b/src/org/python/antlr/op/AddDerived.java
--- a/src/org/python/antlr/op/AddDerived.java
+++ b/src/org/python/antlr/op/AddDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AndDerived.java b/src/org/python/antlr/op/AndDerived.java
--- a/src/org/python/antlr/op/AndDerived.java
+++ b/src/org/python/antlr/op/AndDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AugLoadDerived.java b/src/org/python/antlr/op/AugLoadDerived.java
--- a/src/org/python/antlr/op/AugLoadDerived.java
+++ b/src/org/python/antlr/op/AugLoadDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AugStoreDerived.java b/src/org/python/antlr/op/AugStoreDerived.java
--- a/src/org/python/antlr/op/AugStoreDerived.java
+++ b/src/org/python/antlr/op/AugStoreDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/BitAndDerived.java b/src/org/python/antlr/op/BitAndDerived.java
--- a/src/org/python/antlr/op/BitAndDerived.java
+++ b/src/org/python/antlr/op/BitAndDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/BitOrDerived.java b/src/org/python/antlr/op/BitOrDerived.java
--- a/src/org/python/antlr/op/BitOrDerived.java
+++ b/src/org/python/antlr/op/BitOrDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/BitXorDerived.java b/src/org/python/antlr/op/BitXorDerived.java
--- a/src/org/python/antlr/op/BitXorDerived.java
+++ b/src/org/python/antlr/op/BitXorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/DelDerived.java b/src/org/python/antlr/op/DelDerived.java
--- a/src/org/python/antlr/op/DelDerived.java
+++ b/src/org/python/antlr/op/DelDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/DivDerived.java b/src/org/python/antlr/op/DivDerived.java
--- a/src/org/python/antlr/op/DivDerived.java
+++ b/src/org/python/antlr/op/DivDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/EqDerived.java b/src/org/python/antlr/op/EqDerived.java
--- a/src/org/python/antlr/op/EqDerived.java
+++ b/src/org/python/antlr/op/EqDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/FloorDivDerived.java b/src/org/python/antlr/op/FloorDivDerived.java
--- a/src/org/python/antlr/op/FloorDivDerived.java
+++ b/src/org/python/antlr/op/FloorDivDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/GtDerived.java b/src/org/python/antlr/op/GtDerived.java
--- a/src/org/python/antlr/op/GtDerived.java
+++ b/src/org/python/antlr/op/GtDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/GtEDerived.java b/src/org/python/antlr/op/GtEDerived.java
--- a/src/org/python/antlr/op/GtEDerived.java
+++ b/src/org/python/antlr/op/GtEDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/InDerived.java b/src/org/python/antlr/op/InDerived.java
--- a/src/org/python/antlr/op/InDerived.java
+++ b/src/org/python/antlr/op/InDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/InvertDerived.java b/src/org/python/antlr/op/InvertDerived.java
--- a/src/org/python/antlr/op/InvertDerived.java
+++ b/src/org/python/antlr/op/InvertDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/IsDerived.java b/src/org/python/antlr/op/IsDerived.java
--- a/src/org/python/antlr/op/IsDerived.java
+++ b/src/org/python/antlr/op/IsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/IsNotDerived.java b/src/org/python/antlr/op/IsNotDerived.java
--- a/src/org/python/antlr/op/IsNotDerived.java
+++ b/src/org/python/antlr/op/IsNotDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LShiftDerived.java b/src/org/python/antlr/op/LShiftDerived.java
--- a/src/org/python/antlr/op/LShiftDerived.java
+++ b/src/org/python/antlr/op/LShiftDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LoadDerived.java b/src/org/python/antlr/op/LoadDerived.java
--- a/src/org/python/antlr/op/LoadDerived.java
+++ b/src/org/python/antlr/op/LoadDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LtDerived.java b/src/org/python/antlr/op/LtDerived.java
--- a/src/org/python/antlr/op/LtDerived.java
+++ b/src/org/python/antlr/op/LtDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LtEDerived.java b/src/org/python/antlr/op/LtEDerived.java
--- a/src/org/python/antlr/op/LtEDerived.java
+++ b/src/org/python/antlr/op/LtEDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/ModDerived.java b/src/org/python/antlr/op/ModDerived.java
--- a/src/org/python/antlr/op/ModDerived.java
+++ b/src/org/python/antlr/op/ModDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/MultDerived.java b/src/org/python/antlr/op/MultDerived.java
--- a/src/org/python/antlr/op/MultDerived.java
+++ b/src/org/python/antlr/op/MultDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/NotDerived.java b/src/org/python/antlr/op/NotDerived.java
--- a/src/org/python/antlr/op/NotDerived.java
+++ b/src/org/python/antlr/op/NotDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/NotEqDerived.java b/src/org/python/antlr/op/NotEqDerived.java
--- a/src/org/python/antlr/op/NotEqDerived.java
+++ b/src/org/python/antlr/op/NotEqDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/NotInDerived.java b/src/org/python/antlr/op/NotInDerived.java
--- a/src/org/python/antlr/op/NotInDerived.java
+++ b/src/org/python/antlr/op/NotInDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/OrDerived.java b/src/org/python/antlr/op/OrDerived.java
--- a/src/org/python/antlr/op/OrDerived.java
+++ b/src/org/python/antlr/op/OrDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/ParamDerived.java b/src/org/python/antlr/op/ParamDerived.java
--- a/src/org/python/antlr/op/ParamDerived.java
+++ b/src/org/python/antlr/op/ParamDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/PowDerived.java b/src/org/python/antlr/op/PowDerived.java
--- a/src/org/python/antlr/op/PowDerived.java
+++ b/src/org/python/antlr/op/PowDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/RShiftDerived.java b/src/org/python/antlr/op/RShiftDerived.java
--- a/src/org/python/antlr/op/RShiftDerived.java
+++ b/src/org/python/antlr/op/RShiftDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/StoreDerived.java b/src/org/python/antlr/op/StoreDerived.java
--- a/src/org/python/antlr/op/StoreDerived.java
+++ b/src/org/python/antlr/op/StoreDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/SubDerived.java b/src/org/python/antlr/op/SubDerived.java
--- a/src/org/python/antlr/op/SubDerived.java
+++ b/src/org/python/antlr/op/SubDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/UAddDerived.java b/src/org/python/antlr/op/UAddDerived.java
--- a/src/org/python/antlr/op/UAddDerived.java
+++ b/src/org/python/antlr/op/UAddDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/USubDerived.java b/src/org/python/antlr/op/USubDerived.java
--- a/src/org/python/antlr/op/USubDerived.java
+++ b/src/org/python/antlr/op/USubDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyArrayDerived.java b/src/org/python/core/PyArrayDerived.java
--- a/src/org/python/core/PyArrayDerived.java
+++ b/src/org/python/core/PyArrayDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyByteArrayDerived.java b/src/org/python/core/PyByteArrayDerived.java
--- a/src/org/python/core/PyByteArrayDerived.java
+++ b/src/org/python/core/PyByteArrayDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyClassMethodDerived.java b/src/org/python/core/PyClassMethodDerived.java
--- a/src/org/python/core/PyClassMethodDerived.java
+++ b/src/org/python/core/PyClassMethodDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyComplexDerived.java b/src/org/python/core/PyComplexDerived.java
--- a/src/org/python/core/PyComplexDerived.java
+++ b/src/org/python/core/PyComplexDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyDictionaryDerived.java b/src/org/python/core/PyDictionaryDerived.java
--- a/src/org/python/core/PyDictionaryDerived.java
+++ b/src/org/python/core/PyDictionaryDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyEnumerateDerived.java b/src/org/python/core/PyEnumerateDerived.java
--- a/src/org/python/core/PyEnumerateDerived.java
+++ b/src/org/python/core/PyEnumerateDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyFileDerived.java b/src/org/python/core/PyFileDerived.java
--- a/src/org/python/core/PyFileDerived.java
+++ b/src/org/python/core/PyFileDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyFloatDerived.java b/src/org/python/core/PyFloatDerived.java
--- a/src/org/python/core/PyFloatDerived.java
+++ b/src/org/python/core/PyFloatDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyFrozenSetDerived.java b/src/org/python/core/PyFrozenSetDerived.java
--- a/src/org/python/core/PyFrozenSetDerived.java
+++ b/src/org/python/core/PyFrozenSetDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyIntegerDerived.java b/src/org/python/core/PyIntegerDerived.java
--- a/src/org/python/core/PyIntegerDerived.java
+++ b/src/org/python/core/PyIntegerDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyListDerived.java b/src/org/python/core/PyListDerived.java
--- a/src/org/python/core/PyListDerived.java
+++ b/src/org/python/core/PyListDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyLongDerived.java b/src/org/python/core/PyLongDerived.java
--- a/src/org/python/core/PyLongDerived.java
+++ b/src/org/python/core/PyLongDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyObjectDerived.java b/src/org/python/core/PyObjectDerived.java
--- a/src/org/python/core/PyObjectDerived.java
+++ b/src/org/python/core/PyObjectDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyPropertyDerived.java b/src/org/python/core/PyPropertyDerived.java
--- a/src/org/python/core/PyPropertyDerived.java
+++ b/src/org/python/core/PyPropertyDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PySetDerived.java b/src/org/python/core/PySetDerived.java
--- a/src/org/python/core/PySetDerived.java
+++ b/src/org/python/core/PySetDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyStringDerived.java b/src/org/python/core/PyStringDerived.java
--- a/src/org/python/core/PyStringDerived.java
+++ b/src/org/python/core/PyStringDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PySuperDerived.java b/src/org/python/core/PySuperDerived.java
--- a/src/org/python/core/PySuperDerived.java
+++ b/src/org/python/core/PySuperDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyTupleDerived.java b/src/org/python/core/PyTupleDerived.java
--- a/src/org/python/core/PyTupleDerived.java
+++ b/src/org/python/core/PyTupleDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyUnicodeDerived.java b/src/org/python/core/PyUnicodeDerived.java
--- a/src/org/python/core/PyUnicodeDerived.java
+++ b/src/org/python/core/PyUnicodeDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/PyStructDerived.java b/src/org/python/modules/PyStructDerived.java
--- a/src/org/python/modules/PyStructDerived.java
+++ b/src/org/python/modules/PyStructDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_collections/PyDefaultDictDerived.java b/src/org/python/modules/_collections/PyDefaultDictDerived.java
--- a/src/org/python/modules/_collections/PyDefaultDictDerived.java
+++ b/src/org/python/modules/_collections/PyDefaultDictDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_collections/PyDequeDerived.java b/src/org/python/modules/_collections/PyDequeDerived.java
--- a/src/org/python/modules/_collections/PyDequeDerived.java
+++ b/src/org/python/modules/_collections/PyDequeDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_functools/PyPartialDerived.java b/src/org/python/modules/_functools/PyPartialDerived.java
--- a/src/org/python/modules/_functools/PyPartialDerived.java
+++ b/src/org/python/modules/_functools/PyPartialDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_weakref/ReferenceTypeDerived.java b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
--- a/src/org/python/modules/_weakref/ReferenceTypeDerived.java
+++ b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/bz2/PyBZ2CompressorDerived.java b/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
--- a/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java b/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
--- a/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/bz2/PyBZ2FileDerived.java b/src/org/python/modules/bz2/PyBZ2FileDerived.java
--- a/src/org/python/modules/bz2/PyBZ2FileDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2FileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/PyTeeIteratorDerived.java b/src/org/python/modules/itertools/PyTeeIteratorDerived.java
--- a/src/org/python/modules/itertools/PyTeeIteratorDerived.java
+++ b/src/org/python/modules/itertools/PyTeeIteratorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/chainDerived.java b/src/org/python/modules/itertools/chainDerived.java
--- a/src/org/python/modules/itertools/chainDerived.java
+++ b/src/org/python/modules/itertools/chainDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/combinationsDerived.java b/src/org/python/modules/itertools/combinationsDerived.java
--- a/src/org/python/modules/itertools/combinationsDerived.java
+++ b/src/org/python/modules/itertools/combinationsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/combinationsWithReplacementDerived.java b/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
--- a/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
+++ b/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/compressDerived.java b/src/org/python/modules/itertools/compressDerived.java
--- a/src/org/python/modules/itertools/compressDerived.java
+++ b/src/org/python/modules/itertools/compressDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/countDerived.java b/src/org/python/modules/itertools/countDerived.java
--- a/src/org/python/modules/itertools/countDerived.java
+++ b/src/org/python/modules/itertools/countDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/cycleDerived.java b/src/org/python/modules/itertools/cycleDerived.java
--- a/src/org/python/modules/itertools/cycleDerived.java
+++ b/src/org/python/modules/itertools/cycleDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/dropwhileDerived.java b/src/org/python/modules/itertools/dropwhileDerived.java
--- a/src/org/python/modules/itertools/dropwhileDerived.java
+++ b/src/org/python/modules/itertools/dropwhileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/groupbyDerived.java b/src/org/python/modules/itertools/groupbyDerived.java
--- a/src/org/python/modules/itertools/groupbyDerived.java
+++ b/src/org/python/modules/itertools/groupbyDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/ifilterDerived.java b/src/org/python/modules/itertools/ifilterDerived.java
--- a/src/org/python/modules/itertools/ifilterDerived.java
+++ b/src/org/python/modules/itertools/ifilterDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/ifilterfalseDerived.java b/src/org/python/modules/itertools/ifilterfalseDerived.java
--- a/src/org/python/modules/itertools/ifilterfalseDerived.java
+++ b/src/org/python/modules/itertools/ifilterfalseDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/isliceDerived.java b/src/org/python/modules/itertools/isliceDerived.java
--- a/src/org/python/modules/itertools/isliceDerived.java
+++ b/src/org/python/modules/itertools/isliceDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/izipDerived.java b/src/org/python/modules/itertools/izipDerived.java
--- a/src/org/python/modules/itertools/izipDerived.java
+++ b/src/org/python/modules/itertools/izipDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/izipLongestDerived.java b/src/org/python/modules/itertools/izipLongestDerived.java
--- a/src/org/python/modules/itertools/izipLongestDerived.java
+++ b/src/org/python/modules/itertools/izipLongestDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/permutationsDerived.java b/src/org/python/modules/itertools/permutationsDerived.java
--- a/src/org/python/modules/itertools/permutationsDerived.java
+++ b/src/org/python/modules/itertools/permutationsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/productDerived.java b/src/org/python/modules/itertools/productDerived.java
--- a/src/org/python/modules/itertools/productDerived.java
+++ b/src/org/python/modules/itertools/productDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/repeatDerived.java b/src/org/python/modules/itertools/repeatDerived.java
--- a/src/org/python/modules/itertools/repeatDerived.java
+++ b/src/org/python/modules/itertools/repeatDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/starmapDerived.java b/src/org/python/modules/itertools/starmapDerived.java
--- a/src/org/python/modules/itertools/starmapDerived.java
+++ b/src/org/python/modules/itertools/starmapDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/takewhileDerived.java b/src/org/python/modules/itertools/takewhileDerived.java
--- a/src/org/python/modules/itertools/takewhileDerived.java
+++ b/src/org/python/modules/itertools/takewhileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/random/PyRandomDerived.java b/src/org/python/modules/random/PyRandomDerived.java
--- a/src/org/python/modules/random/PyRandomDerived.java
+++ b/src/org/python/modules/random/PyRandomDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/zipimport/zipimporterDerived.java b/src/org/python/modules/zipimport/zipimporterDerived.java
--- a/src/org/python/modules/zipimport/zipimporterDerived.java
+++ b/src/org/python/modules/zipimport/zipimporterDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private PyObject dict;
+    private AbstractDict dict;
 
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return dict;
     }
 
-    public PyObject getDict() {
+    public AbstractDict getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
-        if (newDict instanceof PyStringMap||newDict instanceof PyDictionary) {
-            dict=newDict;
+        if (newDict instanceof AbstractDict) {
+            dict=(AbstractDict)newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/templates/gderived-defs b/src/templates/gderived-defs
--- a/src/templates/gderived-defs
+++ b/src/templates/gderived-defs
@@ -98,19 +98,19 @@
     return super.`unary();
   }
 define: (ClassBodyDeclarations)userdict
-  private PyObject dict;
+  private AbstractDict dict;
 
-  public PyObject fastGetDict() {
+  public AbstractDict fastGetDict() {
     return dict;
   }
 
-  public PyObject getDict() {
+  public AbstractDict getDict() {
     return dict;
   }
 
   public void setDict(PyObject newDict) {
-    if (newDict instanceof PyStringMap || newDict instanceof PyDictionary ) {
-      dict = newDict;
+    if (newDict instanceof AbstractDict) {
+      dict = (AbstractDict) newDict;
       if (dict.__finditem__(PyString.fromInterned("__del__")) != null &&
         !JyAttribute.hasAttr(this, JyAttribute.FINALIZE_TRIGGER_ATTR)) {
         FinalizeTrigger.ensureFinalizer(this);
@@ -123,7 +123,7 @@
 
   public void delDict() {
     // deleting an object's instance dict makes it grow a new one
-    dict = new PyStringMap();  
+    dict = new PyStringMap();
   }
 
 define: (ClassBodyDeclarations)ctr

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

From jython-checkins at python.org  Sun Jan  8 18:09:39 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Sun, 08 Jan 2017 23:09:39 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Applied_AbstractDict-unific?=
 =?utf-8?q?ation_of_PyDictionary_and_PyStringMap_to_various?=
Message-ID: <20170108230939.20002.84031.EFB7B8BA@psf.io>

https://hg.python.org/jython/rev/2315cf2259b6
changeset:   7991:2315cf2259b6
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 00:09:25 2017 +0100
summary:
  Applied AbstractDict-unification of PyDictionary and PyStringMap to various further places.

files:
  src/org/python/core/PyBaseException.java         |   2 +-
  src/org/python/core/PyClass.java                 |  12 +++++-----
  src/org/python/core/PyFunction.java              |   8 +++---
  src/org/python/core/PyInstance.java              |   2 +-
  src/org/python/core/PyModule.java                |   3 +-
  src/org/python/core/PyObject.java                |   3 +-
  src/org/python/core/PyString.java                |   2 +-
  src/org/python/core/PyStringMap.java             |   9 +-----
  src/org/python/modules/_functools/PyPartial.java |   9 ++++---
  9 files changed, 22 insertions(+), 28 deletions(-)


diff --git a/src/org/python/core/PyBaseException.java b/src/org/python/core/PyBaseException.java
--- a/src/org/python/core/PyBaseException.java
+++ b/src/org/python/core/PyBaseException.java
@@ -96,7 +96,7 @@
     @ExposedMethod(doc = BuiltinDocs.BaseException___setstate___doc)
     final PyObject BaseException___setstate__(PyObject state) {
         if (state != Py.None) {
-            if (!(state instanceof PyStringMap) && !(state instanceof PyDictionary)) {
+            if (!(state instanceof AbstractDict)) {
                 throw Py.TypeError("state is not a dictionary");
             }
             for (PyObject key : state.asIterable()) {
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
@@ -14,7 +14,7 @@
     public static final PyType TYPE = PyType.fromClass(PyClass.class);
 
     /** Holds the namespace for this class */
-    public PyObject __dict__;
+    public AbstractDict __dict__;
 
     /** The base classes of this class */
     public PyTuple __bases__;
@@ -46,7 +46,7 @@
         if (!name.getType().isSubType(PyString.TYPE)) {
             throw Py.TypeError("PyClass_New: name must be a string");
         }
-        if (!(dict instanceof PyStringMap || dict instanceof PyDictionary)) {
+        if (!(dict instanceof AbstractDict)) {
             throw Py.TypeError("PyClass_New: dict must be a dictionary");
         }
         PyType.ensureDoc(dict);
@@ -69,7 +69,7 @@
         PyClass klass = new PyClass();
         klass.__name__ = name.toString();
         klass.__bases__ = basesTuple;
-        klass.__dict__ = dict;
+        klass.__dict__ = (AbstractDict) dict;
         klass.cacheDescriptors();
         return klass;
     }
@@ -100,7 +100,7 @@
     }
 
     @Override
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return __dict__;
     }
 
@@ -248,10 +248,10 @@
     }
 
     public void setDict(PyObject value) {
-        if (value == null || !(value instanceof PyStringMap || value instanceof PyDictionary)) {
+        if (value == null || !(value instanceof AbstractDict)) {
             throw Py.TypeError("__dict__ must be a dictionary object");
         }
-        __dict__ = value;
+        __dict__ = (AbstractDict) value;
     }
 
     public void setBases(PyObject value) {
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
@@ -47,7 +47,7 @@
      * A function's lazily created __dict__; allows arbitrary
      * attributes to be tacked on. Read only.
      */
-    public PyObject __dict__;
+    public AbstractDict __dict__;
 
     /** A read only closure tuple for nested scopes. */
     @ExposedGet
@@ -269,7 +269,7 @@
     }
 
     @Override
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return __dict__;
     }
 
@@ -281,10 +281,10 @@
 
     @ExposedSet(name = "__dict__")
     public void setDict(PyObject value) {
-        if (!(value instanceof PyDictionary) && !(value instanceof PyStringMap)) {
+        if (!(value instanceof AbstractDict)) {
             throw Py.TypeError("setting function's dictionary to a non-dict");
         }
-        __dict__ = value;
+        __dict__ = (AbstractDict) value;
     }
 
     @ExposedDelete(name = "__dict__")
diff --git a/src/org/python/core/PyInstance.java b/src/org/python/core/PyInstance.java
--- a/src/org/python/core/PyInstance.java
+++ b/src/org/python/core/PyInstance.java
@@ -52,7 +52,7 @@
         PyObject dict = ap.getPyObject(1, Py.None);
         if (dict == Py.None) {
             dict = null;
-        } else if (!(dict instanceof PyStringMap || dict instanceof PyDictionary)) {
+        } else if (!(dict instanceof AbstractDict)) {
             throw Py.TypeError("instance() second arg must be dictionary or None");
         }
         return new PyInstance(klass, dict);
diff --git a/src/org/python/core/PyModule.java b/src/org/python/core/PyModule.java
--- a/src/org/python/core/PyModule.java
+++ b/src/org/python/core/PyModule.java
@@ -199,8 +199,7 @@
             d = __dict__;
         }
         if (d == null ||
-                !(d instanceof PyDictionary ||
-                  d instanceof PyStringMap ||
+                !(d instanceof AbstractDict ||
                   d instanceof PyDictProxy)) {
             throw Py.TypeError(String.format("%.200s.__dict__ is not a dictionary",
                     getType().fastGetName().toLowerCase()));
diff --git a/src/org/python/core/PyObject.java b/src/org/python/core/PyObject.java
--- a/src/org/python/core/PyObject.java
+++ b/src/org/python/core/PyObject.java
@@ -1120,8 +1120,7 @@
         if (obj == null) {
             return;
         }
-        if (obj instanceof PyDictionary || obj instanceof PyStringMap
-            || obj instanceof PyDictProxy) {
+        if (obj instanceof AbstractDict || obj instanceof PyDictProxy) {
             accum.update(obj);
         }
     }
diff --git a/src/org/python/core/PyString.java b/src/org/python/core/PyString.java
--- a/src/org/python/core/PyString.java
+++ b/src/org/python/core/PyString.java
@@ -4508,7 +4508,7 @@
         } else {
             // Not a tuple, but possibly still some kind of container: use special argIndex values.
             argIndex = -1;
-            if (args instanceof PyDictionary || args instanceof PyStringMap
+            if (args instanceof AbstractDict
                     || (!(args instanceof PySequence) && args.__findattr__("__getitem__") != null)) {
                 dict = args;
                 argIndex = -3;
diff --git a/src/org/python/core/PyStringMap.java b/src/org/python/core/PyStringMap.java
--- a/src/org/python/core/PyStringMap.java
+++ b/src/org/python/core/PyStringMap.java
@@ -266,7 +266,7 @@
 
     @ExposedMethod(type = MethodType.CMP, doc = BuiltinDocs.dict___cmp___doc)
     final int stringmap___cmp__(PyObject other) {
-        if (!(other instanceof PyStringMap || other instanceof PyDictionary)) {
+        if (!(other instanceof AbstractDict)) {
             return -2;
         }
         int an = __len__();
@@ -278,12 +278,7 @@
             return 1;
         }
         PyList akeys = keys();
-        PyList bkeys = null;
-        if (other instanceof PyStringMap) {
-            bkeys = ((PyStringMap)other).keys();
-        } else {
-            bkeys = ((PyDictionary)other).keys();
-        }
+        PyList bkeys = ((AbstractDict) other).keys();
         akeys.sort();
         bkeys.sort();
         for (int i = 0; i < bn; i++) {
diff --git a/src/org/python/modules/_functools/PyPartial.java b/src/org/python/modules/_functools/PyPartial.java
--- a/src/org/python/modules/_functools/PyPartial.java
+++ b/src/org/python/modules/_functools/PyPartial.java
@@ -8,6 +8,7 @@
 import org.python.core.PyNewWrapper;
 import org.python.core.PyObject;
 import org.python.core.PyStringMap;
+import org.python.core.AbstractDict;
 import org.python.core.PyTuple;
 import org.python.core.PyType;
 import org.python.core.Traverseproc;
@@ -35,7 +36,7 @@
     private String[] keywords;
 
     /** Lazily created dict for extra attributes. */
-    private PyObject __dict__;
+    private AbstractDict __dict__;
 
     public PyPartial() {
         super(TYPE);
@@ -162,7 +163,7 @@
     }
 
     @Override
-    public PyObject fastGetDict() {
+    public AbstractDict fastGetDict() {
         return __dict__;
     }
 
@@ -176,10 +177,10 @@
     @Override
     @ExposedSet(name = "__dict__")
     public void setDict(PyObject val) {
-        if (!(val instanceof PyStringMap) && !(val instanceof PyDictionary)) {
+        if (!(val instanceof AbstractDict)) {
             throw Py.TypeError("setting partial object's dictionary to a non-dict");
         }
-        __dict__ = val;
+        __dict__ = (AbstractDict) val;
     }
 
     private void ensureDict() {

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

From jython-checkins at python.org  Mon Jan  9 03:21:09 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 08:21:09 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Reverted_some_API-changes_r?=
 =?utf-8?q?egarding_AbstractDict=2E_First_I_thought_making_some?=
Message-ID: <20170109082109.27295.22973.82E0E8A5@psf.io>

https://hg.python.org/jython/rev/e0a0ce426930
changeset:   7992:e0a0ce426930
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 09:20:32 2017 +0100
summary:
  Reverted some API-changes regarding AbstractDict. First I thought making some types tighter wouldn't be an API-change. However code that uses reflection or JNI on such fields might break and maybe other circumstances might cause problems too. All sorts of stuff might need recompilation. So although it wouldn't cause *real* trouble, such changes should be avoided in minor version update. Stay tuned for Jython 3... :)

files:
  src/org/python/antlr/ast/AssertDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/AssignDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/AttributeDerived.java                           |  8 ++++----
  src/org/python/antlr/ast/AugAssignDerived.java                           |  8 ++++----
  src/org/python/antlr/ast/BinOpDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/BoolOpDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/BreakDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/CallDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/ClassDefDerived.java                            |  8 ++++----
  src/org/python/antlr/ast/CompareDerived.java                             |  8 ++++----
  src/org/python/antlr/ast/ContinueDerived.java                            |  8 ++++----
  src/org/python/antlr/ast/DeleteDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/DictDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/EllipsisDerived.java                            |  8 ++++----
  src/org/python/antlr/ast/ExceptHandlerDerived.java                       |  8 ++++----
  src/org/python/antlr/ast/ExecDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/ExprDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/ExpressionDerived.java                          |  8 ++++----
  src/org/python/antlr/ast/ExtSliceDerived.java                            |  8 ++++----
  src/org/python/antlr/ast/ForDerived.java                                 |  8 ++++----
  src/org/python/antlr/ast/FunctionDefDerived.java                         |  8 ++++----
  src/org/python/antlr/ast/GeneratorExpDerived.java                        |  8 ++++----
  src/org/python/antlr/ast/GlobalDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/IfDerived.java                                  |  8 ++++----
  src/org/python/antlr/ast/IfExpDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/ImportDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/ImportFromDerived.java                          |  8 ++++----
  src/org/python/antlr/ast/IndexDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/InteractiveDerived.java                         |  8 ++++----
  src/org/python/antlr/ast/LambdaDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/ListCompDerived.java                            |  8 ++++----
  src/org/python/antlr/ast/ListDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/ModuleDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/NameDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/NumDerived.java                                 |  8 ++++----
  src/org/python/antlr/ast/PassDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/PrintDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/RaiseDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/ReprDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/ReturnDerived.java                              |  8 ++++----
  src/org/python/antlr/ast/SliceDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/StrDerived.java                                 |  8 ++++----
  src/org/python/antlr/ast/SubscriptDerived.java                           |  8 ++++----
  src/org/python/antlr/ast/SuiteDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/TryExceptDerived.java                           |  8 ++++----
  src/org/python/antlr/ast/TryFinallyDerived.java                          |  8 ++++----
  src/org/python/antlr/ast/TupleDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/UnaryOpDerived.java                             |  8 ++++----
  src/org/python/antlr/ast/WhileDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/WithDerived.java                                |  8 ++++----
  src/org/python/antlr/ast/YieldDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/aliasDerived.java                               |  8 ++++----
  src/org/python/antlr/ast/argumentsDerived.java                           |  8 ++++----
  src/org/python/antlr/ast/comprehensionDerived.java                       |  8 ++++----
  src/org/python/antlr/ast/keywordDerived.java                             |  8 ++++----
  src/org/python/antlr/op/AddDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/AndDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/AugLoadDerived.java                              |  8 ++++----
  src/org/python/antlr/op/AugStoreDerived.java                             |  8 ++++----
  src/org/python/antlr/op/BitAndDerived.java                               |  8 ++++----
  src/org/python/antlr/op/BitOrDerived.java                                |  8 ++++----
  src/org/python/antlr/op/BitXorDerived.java                               |  8 ++++----
  src/org/python/antlr/op/DelDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/DivDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/EqDerived.java                                   |  8 ++++----
  src/org/python/antlr/op/FloorDivDerived.java                             |  8 ++++----
  src/org/python/antlr/op/GtDerived.java                                   |  8 ++++----
  src/org/python/antlr/op/GtEDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/InDerived.java                                   |  8 ++++----
  src/org/python/antlr/op/InvertDerived.java                               |  8 ++++----
  src/org/python/antlr/op/IsDerived.java                                   |  8 ++++----
  src/org/python/antlr/op/IsNotDerived.java                                |  8 ++++----
  src/org/python/antlr/op/LShiftDerived.java                               |  8 ++++----
  src/org/python/antlr/op/LoadDerived.java                                 |  8 ++++----
  src/org/python/antlr/op/LtDerived.java                                   |  8 ++++----
  src/org/python/antlr/op/LtEDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/ModDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/MultDerived.java                                 |  8 ++++----
  src/org/python/antlr/op/NotDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/NotEqDerived.java                                |  8 ++++----
  src/org/python/antlr/op/NotInDerived.java                                |  8 ++++----
  src/org/python/antlr/op/OrDerived.java                                   |  8 ++++----
  src/org/python/antlr/op/ParamDerived.java                                |  8 ++++----
  src/org/python/antlr/op/PowDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/RShiftDerived.java                               |  8 ++++----
  src/org/python/antlr/op/StoreDerived.java                                |  8 ++++----
  src/org/python/antlr/op/SubDerived.java                                  |  8 ++++----
  src/org/python/antlr/op/UAddDerived.java                                 |  8 ++++----
  src/org/python/antlr/op/USubDerived.java                                 |  8 ++++----
  src/org/python/core/PyArrayDerived.java                                  |  8 ++++----
  src/org/python/core/PyByteArrayDerived.java                              |  8 ++++----
  src/org/python/core/PyClass.java                                         |  8 ++++----
  src/org/python/core/PyClassMethodDerived.java                            |  8 ++++----
  src/org/python/core/PyComplexDerived.java                                |  8 ++++----
  src/org/python/core/PyDictionaryDerived.java                             |  8 ++++----
  src/org/python/core/PyEnumerateDerived.java                              |  8 ++++----
  src/org/python/core/PyFileDerived.java                                   |  8 ++++----
  src/org/python/core/PyFloatDerived.java                                  |  8 ++++----
  src/org/python/core/PyFrozenSetDerived.java                              |  8 ++++----
  src/org/python/core/PyFunction.java                                      |  6 +++---
  src/org/python/core/PyIntegerDerived.java                                |  8 ++++----
  src/org/python/core/PyListDerived.java                                   |  8 ++++----
  src/org/python/core/PyLongDerived.java                                   |  8 ++++----
  src/org/python/core/PyObjectDerived.java                                 |  8 ++++----
  src/org/python/core/PyPropertyDerived.java                               |  8 ++++----
  src/org/python/core/PySetDerived.java                                    |  8 ++++----
  src/org/python/core/PyStringDerived.java                                 |  8 ++++----
  src/org/python/core/PySuperDerived.java                                  |  8 ++++----
  src/org/python/core/PyTupleDerived.java                                  |  8 ++++----
  src/org/python/core/PyType.java                                          |  8 ++++----
  src/org/python/core/PyUnicodeDerived.java                                |  8 ++++----
  src/org/python/expose/BaseTypeBuilder.java                               |  3 +--
  src/org/python/expose/TypeBuilder.java                                   |  3 +--
  src/org/python/modules/PyStructDerived.java                              |  8 ++++----
  src/org/python/modules/_collections/PyDefaultDictDerived.java            |  8 ++++----
  src/org/python/modules/_collections/PyDequeDerived.java                  |  8 ++++----
  src/org/python/modules/_functools/PyPartial.java                         |  6 +++---
  src/org/python/modules/_functools/PyPartialDerived.java                  |  8 ++++----
  src/org/python/modules/_weakref/ReferenceTypeDerived.java                |  8 ++++----
  src/org/python/modules/bz2/PyBZ2CompressorDerived.java                   |  8 ++++----
  src/org/python/modules/bz2/PyBZ2DecompressorDerived.java                 |  8 ++++----
  src/org/python/modules/bz2/PyBZ2FileDerived.java                         |  8 ++++----
  src/org/python/modules/itertools/PyTeeIteratorDerived.java               |  8 ++++----
  src/org/python/modules/itertools/chainDerived.java                       |  8 ++++----
  src/org/python/modules/itertools/combinationsDerived.java                |  8 ++++----
  src/org/python/modules/itertools/combinationsWithReplacementDerived.java |  8 ++++----
  src/org/python/modules/itertools/compressDerived.java                    |  8 ++++----
  src/org/python/modules/itertools/countDerived.java                       |  8 ++++----
  src/org/python/modules/itertools/cycleDerived.java                       |  8 ++++----
  src/org/python/modules/itertools/dropwhileDerived.java                   |  8 ++++----
  src/org/python/modules/itertools/groupbyDerived.java                     |  8 ++++----
  src/org/python/modules/itertools/ifilterDerived.java                     |  8 ++++----
  src/org/python/modules/itertools/ifilterfalseDerived.java                |  8 ++++----
  src/org/python/modules/itertools/isliceDerived.java                      |  8 ++++----
  src/org/python/modules/itertools/izipDerived.java                        |  8 ++++----
  src/org/python/modules/itertools/izipLongestDerived.java                 |  8 ++++----
  src/org/python/modules/itertools/permutationsDerived.java                |  8 ++++----
  src/org/python/modules/itertools/productDerived.java                     |  8 ++++----
  src/org/python/modules/itertools/repeatDerived.java                      |  8 ++++----
  src/org/python/modules/itertools/starmapDerived.java                     |  8 ++++----
  src/org/python/modules/itertools/takewhileDerived.java                   |  8 ++++----
  src/org/python/modules/random/PyRandomDerived.java                       |  8 ++++----
  src/org/python/modules/zipimport/zipimporterDerived.java                 |  8 ++++----
  src/templates/gderived-defs                                              |  8 ++++----
  144 files changed, 568 insertions(+), 570 deletions(-)


diff --git a/src/org/python/antlr/ast/AssertDerived.java b/src/org/python/antlr/ast/AssertDerived.java
--- a/src/org/python/antlr/ast/AssertDerived.java
+++ b/src/org/python/antlr/ast/AssertDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/AssignDerived.java b/src/org/python/antlr/ast/AssignDerived.java
--- a/src/org/python/antlr/ast/AssignDerived.java
+++ b/src/org/python/antlr/ast/AssignDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/AttributeDerived.java b/src/org/python/antlr/ast/AttributeDerived.java
--- a/src/org/python/antlr/ast/AttributeDerived.java
+++ b/src/org/python/antlr/ast/AttributeDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/AugAssignDerived.java b/src/org/python/antlr/ast/AugAssignDerived.java
--- a/src/org/python/antlr/ast/AugAssignDerived.java
+++ b/src/org/python/antlr/ast/AugAssignDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/BinOpDerived.java b/src/org/python/antlr/ast/BinOpDerived.java
--- a/src/org/python/antlr/ast/BinOpDerived.java
+++ b/src/org/python/antlr/ast/BinOpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/BoolOpDerived.java b/src/org/python/antlr/ast/BoolOpDerived.java
--- a/src/org/python/antlr/ast/BoolOpDerived.java
+++ b/src/org/python/antlr/ast/BoolOpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/BreakDerived.java b/src/org/python/antlr/ast/BreakDerived.java
--- a/src/org/python/antlr/ast/BreakDerived.java
+++ b/src/org/python/antlr/ast/BreakDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/CallDerived.java b/src/org/python/antlr/ast/CallDerived.java
--- a/src/org/python/antlr/ast/CallDerived.java
+++ b/src/org/python/antlr/ast/CallDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ClassDefDerived.java b/src/org/python/antlr/ast/ClassDefDerived.java
--- a/src/org/python/antlr/ast/ClassDefDerived.java
+++ b/src/org/python/antlr/ast/ClassDefDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/CompareDerived.java b/src/org/python/antlr/ast/CompareDerived.java
--- a/src/org/python/antlr/ast/CompareDerived.java
+++ b/src/org/python/antlr/ast/CompareDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ContinueDerived.java b/src/org/python/antlr/ast/ContinueDerived.java
--- a/src/org/python/antlr/ast/ContinueDerived.java
+++ b/src/org/python/antlr/ast/ContinueDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/DeleteDerived.java b/src/org/python/antlr/ast/DeleteDerived.java
--- a/src/org/python/antlr/ast/DeleteDerived.java
+++ b/src/org/python/antlr/ast/DeleteDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/DictDerived.java b/src/org/python/antlr/ast/DictDerived.java
--- a/src/org/python/antlr/ast/DictDerived.java
+++ b/src/org/python/antlr/ast/DictDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/EllipsisDerived.java b/src/org/python/antlr/ast/EllipsisDerived.java
--- a/src/org/python/antlr/ast/EllipsisDerived.java
+++ b/src/org/python/antlr/ast/EllipsisDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExceptHandlerDerived.java b/src/org/python/antlr/ast/ExceptHandlerDerived.java
--- a/src/org/python/antlr/ast/ExceptHandlerDerived.java
+++ b/src/org/python/antlr/ast/ExceptHandlerDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExecDerived.java b/src/org/python/antlr/ast/ExecDerived.java
--- a/src/org/python/antlr/ast/ExecDerived.java
+++ b/src/org/python/antlr/ast/ExecDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExprDerived.java b/src/org/python/antlr/ast/ExprDerived.java
--- a/src/org/python/antlr/ast/ExprDerived.java
+++ b/src/org/python/antlr/ast/ExprDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExpressionDerived.java b/src/org/python/antlr/ast/ExpressionDerived.java
--- a/src/org/python/antlr/ast/ExpressionDerived.java
+++ b/src/org/python/antlr/ast/ExpressionDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ExtSliceDerived.java b/src/org/python/antlr/ast/ExtSliceDerived.java
--- a/src/org/python/antlr/ast/ExtSliceDerived.java
+++ b/src/org/python/antlr/ast/ExtSliceDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ForDerived.java b/src/org/python/antlr/ast/ForDerived.java
--- a/src/org/python/antlr/ast/ForDerived.java
+++ b/src/org/python/antlr/ast/ForDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/FunctionDefDerived.java b/src/org/python/antlr/ast/FunctionDefDerived.java
--- a/src/org/python/antlr/ast/FunctionDefDerived.java
+++ b/src/org/python/antlr/ast/FunctionDefDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/GeneratorExpDerived.java b/src/org/python/antlr/ast/GeneratorExpDerived.java
--- a/src/org/python/antlr/ast/GeneratorExpDerived.java
+++ b/src/org/python/antlr/ast/GeneratorExpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/GlobalDerived.java b/src/org/python/antlr/ast/GlobalDerived.java
--- a/src/org/python/antlr/ast/GlobalDerived.java
+++ b/src/org/python/antlr/ast/GlobalDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/IfDerived.java b/src/org/python/antlr/ast/IfDerived.java
--- a/src/org/python/antlr/ast/IfDerived.java
+++ b/src/org/python/antlr/ast/IfDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/IfExpDerived.java b/src/org/python/antlr/ast/IfExpDerived.java
--- a/src/org/python/antlr/ast/IfExpDerived.java
+++ b/src/org/python/antlr/ast/IfExpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ImportDerived.java b/src/org/python/antlr/ast/ImportDerived.java
--- a/src/org/python/antlr/ast/ImportDerived.java
+++ b/src/org/python/antlr/ast/ImportDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ImportFromDerived.java b/src/org/python/antlr/ast/ImportFromDerived.java
--- a/src/org/python/antlr/ast/ImportFromDerived.java
+++ b/src/org/python/antlr/ast/ImportFromDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/IndexDerived.java b/src/org/python/antlr/ast/IndexDerived.java
--- a/src/org/python/antlr/ast/IndexDerived.java
+++ b/src/org/python/antlr/ast/IndexDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/InteractiveDerived.java b/src/org/python/antlr/ast/InteractiveDerived.java
--- a/src/org/python/antlr/ast/InteractiveDerived.java
+++ b/src/org/python/antlr/ast/InteractiveDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/LambdaDerived.java b/src/org/python/antlr/ast/LambdaDerived.java
--- a/src/org/python/antlr/ast/LambdaDerived.java
+++ b/src/org/python/antlr/ast/LambdaDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ListCompDerived.java b/src/org/python/antlr/ast/ListCompDerived.java
--- a/src/org/python/antlr/ast/ListCompDerived.java
+++ b/src/org/python/antlr/ast/ListCompDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ListDerived.java b/src/org/python/antlr/ast/ListDerived.java
--- a/src/org/python/antlr/ast/ListDerived.java
+++ b/src/org/python/antlr/ast/ListDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ModuleDerived.java b/src/org/python/antlr/ast/ModuleDerived.java
--- a/src/org/python/antlr/ast/ModuleDerived.java
+++ b/src/org/python/antlr/ast/ModuleDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/NameDerived.java b/src/org/python/antlr/ast/NameDerived.java
--- a/src/org/python/antlr/ast/NameDerived.java
+++ b/src/org/python/antlr/ast/NameDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/NumDerived.java b/src/org/python/antlr/ast/NumDerived.java
--- a/src/org/python/antlr/ast/NumDerived.java
+++ b/src/org/python/antlr/ast/NumDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/PassDerived.java b/src/org/python/antlr/ast/PassDerived.java
--- a/src/org/python/antlr/ast/PassDerived.java
+++ b/src/org/python/antlr/ast/PassDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/PrintDerived.java b/src/org/python/antlr/ast/PrintDerived.java
--- a/src/org/python/antlr/ast/PrintDerived.java
+++ b/src/org/python/antlr/ast/PrintDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/RaiseDerived.java b/src/org/python/antlr/ast/RaiseDerived.java
--- a/src/org/python/antlr/ast/RaiseDerived.java
+++ b/src/org/python/antlr/ast/RaiseDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ReprDerived.java b/src/org/python/antlr/ast/ReprDerived.java
--- a/src/org/python/antlr/ast/ReprDerived.java
+++ b/src/org/python/antlr/ast/ReprDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/ReturnDerived.java b/src/org/python/antlr/ast/ReturnDerived.java
--- a/src/org/python/antlr/ast/ReturnDerived.java
+++ b/src/org/python/antlr/ast/ReturnDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/SliceDerived.java b/src/org/python/antlr/ast/SliceDerived.java
--- a/src/org/python/antlr/ast/SliceDerived.java
+++ b/src/org/python/antlr/ast/SliceDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/StrDerived.java b/src/org/python/antlr/ast/StrDerived.java
--- a/src/org/python/antlr/ast/StrDerived.java
+++ b/src/org/python/antlr/ast/StrDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/SubscriptDerived.java b/src/org/python/antlr/ast/SubscriptDerived.java
--- a/src/org/python/antlr/ast/SubscriptDerived.java
+++ b/src/org/python/antlr/ast/SubscriptDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/SuiteDerived.java b/src/org/python/antlr/ast/SuiteDerived.java
--- a/src/org/python/antlr/ast/SuiteDerived.java
+++ b/src/org/python/antlr/ast/SuiteDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/TryExceptDerived.java b/src/org/python/antlr/ast/TryExceptDerived.java
--- a/src/org/python/antlr/ast/TryExceptDerived.java
+++ b/src/org/python/antlr/ast/TryExceptDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/TryFinallyDerived.java b/src/org/python/antlr/ast/TryFinallyDerived.java
--- a/src/org/python/antlr/ast/TryFinallyDerived.java
+++ b/src/org/python/antlr/ast/TryFinallyDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/TupleDerived.java b/src/org/python/antlr/ast/TupleDerived.java
--- a/src/org/python/antlr/ast/TupleDerived.java
+++ b/src/org/python/antlr/ast/TupleDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/UnaryOpDerived.java b/src/org/python/antlr/ast/UnaryOpDerived.java
--- a/src/org/python/antlr/ast/UnaryOpDerived.java
+++ b/src/org/python/antlr/ast/UnaryOpDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/WhileDerived.java b/src/org/python/antlr/ast/WhileDerived.java
--- a/src/org/python/antlr/ast/WhileDerived.java
+++ b/src/org/python/antlr/ast/WhileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/WithDerived.java b/src/org/python/antlr/ast/WithDerived.java
--- a/src/org/python/antlr/ast/WithDerived.java
+++ b/src/org/python/antlr/ast/WithDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/YieldDerived.java b/src/org/python/antlr/ast/YieldDerived.java
--- a/src/org/python/antlr/ast/YieldDerived.java
+++ b/src/org/python/antlr/ast/YieldDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/aliasDerived.java b/src/org/python/antlr/ast/aliasDerived.java
--- a/src/org/python/antlr/ast/aliasDerived.java
+++ b/src/org/python/antlr/ast/aliasDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/argumentsDerived.java b/src/org/python/antlr/ast/argumentsDerived.java
--- a/src/org/python/antlr/ast/argumentsDerived.java
+++ b/src/org/python/antlr/ast/argumentsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/comprehensionDerived.java b/src/org/python/antlr/ast/comprehensionDerived.java
--- a/src/org/python/antlr/ast/comprehensionDerived.java
+++ b/src/org/python/antlr/ast/comprehensionDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/ast/keywordDerived.java b/src/org/python/antlr/ast/keywordDerived.java
--- a/src/org/python/antlr/ast/keywordDerived.java
+++ b/src/org/python/antlr/ast/keywordDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AddDerived.java b/src/org/python/antlr/op/AddDerived.java
--- a/src/org/python/antlr/op/AddDerived.java
+++ b/src/org/python/antlr/op/AddDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AndDerived.java b/src/org/python/antlr/op/AndDerived.java
--- a/src/org/python/antlr/op/AndDerived.java
+++ b/src/org/python/antlr/op/AndDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AugLoadDerived.java b/src/org/python/antlr/op/AugLoadDerived.java
--- a/src/org/python/antlr/op/AugLoadDerived.java
+++ b/src/org/python/antlr/op/AugLoadDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/AugStoreDerived.java b/src/org/python/antlr/op/AugStoreDerived.java
--- a/src/org/python/antlr/op/AugStoreDerived.java
+++ b/src/org/python/antlr/op/AugStoreDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/BitAndDerived.java b/src/org/python/antlr/op/BitAndDerived.java
--- a/src/org/python/antlr/op/BitAndDerived.java
+++ b/src/org/python/antlr/op/BitAndDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/BitOrDerived.java b/src/org/python/antlr/op/BitOrDerived.java
--- a/src/org/python/antlr/op/BitOrDerived.java
+++ b/src/org/python/antlr/op/BitOrDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/BitXorDerived.java b/src/org/python/antlr/op/BitXorDerived.java
--- a/src/org/python/antlr/op/BitXorDerived.java
+++ b/src/org/python/antlr/op/BitXorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/DelDerived.java b/src/org/python/antlr/op/DelDerived.java
--- a/src/org/python/antlr/op/DelDerived.java
+++ b/src/org/python/antlr/op/DelDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/DivDerived.java b/src/org/python/antlr/op/DivDerived.java
--- a/src/org/python/antlr/op/DivDerived.java
+++ b/src/org/python/antlr/op/DivDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/EqDerived.java b/src/org/python/antlr/op/EqDerived.java
--- a/src/org/python/antlr/op/EqDerived.java
+++ b/src/org/python/antlr/op/EqDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/FloorDivDerived.java b/src/org/python/antlr/op/FloorDivDerived.java
--- a/src/org/python/antlr/op/FloorDivDerived.java
+++ b/src/org/python/antlr/op/FloorDivDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/GtDerived.java b/src/org/python/antlr/op/GtDerived.java
--- a/src/org/python/antlr/op/GtDerived.java
+++ b/src/org/python/antlr/op/GtDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/GtEDerived.java b/src/org/python/antlr/op/GtEDerived.java
--- a/src/org/python/antlr/op/GtEDerived.java
+++ b/src/org/python/antlr/op/GtEDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/InDerived.java b/src/org/python/antlr/op/InDerived.java
--- a/src/org/python/antlr/op/InDerived.java
+++ b/src/org/python/antlr/op/InDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/InvertDerived.java b/src/org/python/antlr/op/InvertDerived.java
--- a/src/org/python/antlr/op/InvertDerived.java
+++ b/src/org/python/antlr/op/InvertDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/IsDerived.java b/src/org/python/antlr/op/IsDerived.java
--- a/src/org/python/antlr/op/IsDerived.java
+++ b/src/org/python/antlr/op/IsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/IsNotDerived.java b/src/org/python/antlr/op/IsNotDerived.java
--- a/src/org/python/antlr/op/IsNotDerived.java
+++ b/src/org/python/antlr/op/IsNotDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LShiftDerived.java b/src/org/python/antlr/op/LShiftDerived.java
--- a/src/org/python/antlr/op/LShiftDerived.java
+++ b/src/org/python/antlr/op/LShiftDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LoadDerived.java b/src/org/python/antlr/op/LoadDerived.java
--- a/src/org/python/antlr/op/LoadDerived.java
+++ b/src/org/python/antlr/op/LoadDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LtDerived.java b/src/org/python/antlr/op/LtDerived.java
--- a/src/org/python/antlr/op/LtDerived.java
+++ b/src/org/python/antlr/op/LtDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/LtEDerived.java b/src/org/python/antlr/op/LtEDerived.java
--- a/src/org/python/antlr/op/LtEDerived.java
+++ b/src/org/python/antlr/op/LtEDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/ModDerived.java b/src/org/python/antlr/op/ModDerived.java
--- a/src/org/python/antlr/op/ModDerived.java
+++ b/src/org/python/antlr/op/ModDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/MultDerived.java b/src/org/python/antlr/op/MultDerived.java
--- a/src/org/python/antlr/op/MultDerived.java
+++ b/src/org/python/antlr/op/MultDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/NotDerived.java b/src/org/python/antlr/op/NotDerived.java
--- a/src/org/python/antlr/op/NotDerived.java
+++ b/src/org/python/antlr/op/NotDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/NotEqDerived.java b/src/org/python/antlr/op/NotEqDerived.java
--- a/src/org/python/antlr/op/NotEqDerived.java
+++ b/src/org/python/antlr/op/NotEqDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/NotInDerived.java b/src/org/python/antlr/op/NotInDerived.java
--- a/src/org/python/antlr/op/NotInDerived.java
+++ b/src/org/python/antlr/op/NotInDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/OrDerived.java b/src/org/python/antlr/op/OrDerived.java
--- a/src/org/python/antlr/op/OrDerived.java
+++ b/src/org/python/antlr/op/OrDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/ParamDerived.java b/src/org/python/antlr/op/ParamDerived.java
--- a/src/org/python/antlr/op/ParamDerived.java
+++ b/src/org/python/antlr/op/ParamDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/PowDerived.java b/src/org/python/antlr/op/PowDerived.java
--- a/src/org/python/antlr/op/PowDerived.java
+++ b/src/org/python/antlr/op/PowDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/RShiftDerived.java b/src/org/python/antlr/op/RShiftDerived.java
--- a/src/org/python/antlr/op/RShiftDerived.java
+++ b/src/org/python/antlr/op/RShiftDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/StoreDerived.java b/src/org/python/antlr/op/StoreDerived.java
--- a/src/org/python/antlr/op/StoreDerived.java
+++ b/src/org/python/antlr/op/StoreDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/SubDerived.java b/src/org/python/antlr/op/SubDerived.java
--- a/src/org/python/antlr/op/SubDerived.java
+++ b/src/org/python/antlr/op/SubDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/UAddDerived.java b/src/org/python/antlr/op/UAddDerived.java
--- a/src/org/python/antlr/op/UAddDerived.java
+++ b/src/org/python/antlr/op/UAddDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/antlr/op/USubDerived.java b/src/org/python/antlr/op/USubDerived.java
--- a/src/org/python/antlr/op/USubDerived.java
+++ b/src/org/python/antlr/op/USubDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyArrayDerived.java b/src/org/python/core/PyArrayDerived.java
--- a/src/org/python/core/PyArrayDerived.java
+++ b/src/org/python/core/PyArrayDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyByteArrayDerived.java b/src/org/python/core/PyByteArrayDerived.java
--- a/src/org/python/core/PyByteArrayDerived.java
+++ b/src/org/python/core/PyByteArrayDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
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
@@ -14,7 +14,7 @@
     public static final PyType TYPE = PyType.fromClass(PyClass.class);
 
     /** Holds the namespace for this class */
-    public AbstractDict __dict__;
+    public PyObject __dict__;
 
     /** The base classes of this class */
     public PyTuple __bases__;
@@ -69,7 +69,7 @@
         PyClass klass = new PyClass();
         klass.__name__ = name.toString();
         klass.__bases__ = basesTuple;
-        klass.__dict__ = (AbstractDict) dict;
+        klass.__dict__ = dict;
         klass.cacheDescriptors();
         return klass;
     }
@@ -100,7 +100,7 @@
     }
 
     @Override
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return __dict__;
     }
 
@@ -251,7 +251,7 @@
         if (value == null || !(value instanceof AbstractDict)) {
             throw Py.TypeError("__dict__ must be a dictionary object");
         }
-        __dict__ = (AbstractDict) value;
+        __dict__ = value;
     }
 
     public void setBases(PyObject value) {
diff --git a/src/org/python/core/PyClassMethodDerived.java b/src/org/python/core/PyClassMethodDerived.java
--- a/src/org/python/core/PyClassMethodDerived.java
+++ b/src/org/python/core/PyClassMethodDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyComplexDerived.java b/src/org/python/core/PyComplexDerived.java
--- a/src/org/python/core/PyComplexDerived.java
+++ b/src/org/python/core/PyComplexDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyDictionaryDerived.java b/src/org/python/core/PyDictionaryDerived.java
--- a/src/org/python/core/PyDictionaryDerived.java
+++ b/src/org/python/core/PyDictionaryDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyEnumerateDerived.java b/src/org/python/core/PyEnumerateDerived.java
--- a/src/org/python/core/PyEnumerateDerived.java
+++ b/src/org/python/core/PyEnumerateDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyFileDerived.java b/src/org/python/core/PyFileDerived.java
--- a/src/org/python/core/PyFileDerived.java
+++ b/src/org/python/core/PyFileDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyFloatDerived.java b/src/org/python/core/PyFloatDerived.java
--- a/src/org/python/core/PyFloatDerived.java
+++ b/src/org/python/core/PyFloatDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyFrozenSetDerived.java b/src/org/python/core/PyFrozenSetDerived.java
--- a/src/org/python/core/PyFrozenSetDerived.java
+++ b/src/org/python/core/PyFrozenSetDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
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
@@ -47,7 +47,7 @@
      * A function's lazily created __dict__; allows arbitrary
      * attributes to be tacked on. Read only.
      */
-    public AbstractDict __dict__;
+    public PyObject __dict__;
 
     /** A read only closure tuple for nested scopes. */
     @ExposedGet
@@ -269,7 +269,7 @@
     }
 
     @Override
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return __dict__;
     }
 
@@ -284,7 +284,7 @@
         if (!(value instanceof AbstractDict)) {
             throw Py.TypeError("setting function's dictionary to a non-dict");
         }
-        __dict__ = (AbstractDict) value;
+        __dict__ = value;
     }
 
     @ExposedDelete(name = "__dict__")
diff --git a/src/org/python/core/PyIntegerDerived.java b/src/org/python/core/PyIntegerDerived.java
--- a/src/org/python/core/PyIntegerDerived.java
+++ b/src/org/python/core/PyIntegerDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyListDerived.java b/src/org/python/core/PyListDerived.java
--- a/src/org/python/core/PyListDerived.java
+++ b/src/org/python/core/PyListDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyLongDerived.java b/src/org/python/core/PyLongDerived.java
--- a/src/org/python/core/PyLongDerived.java
+++ b/src/org/python/core/PyLongDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyObjectDerived.java b/src/org/python/core/PyObjectDerived.java
--- a/src/org/python/core/PyObjectDerived.java
+++ b/src/org/python/core/PyObjectDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyPropertyDerived.java b/src/org/python/core/PyPropertyDerived.java
--- a/src/org/python/core/PyPropertyDerived.java
+++ b/src/org/python/core/PyPropertyDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PySetDerived.java b/src/org/python/core/PySetDerived.java
--- a/src/org/python/core/PySetDerived.java
+++ b/src/org/python/core/PySetDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyStringDerived.java b/src/org/python/core/PyStringDerived.java
--- a/src/org/python/core/PyStringDerived.java
+++ b/src/org/python/core/PyStringDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PySuperDerived.java b/src/org/python/core/PySuperDerived.java
--- a/src/org/python/core/PySuperDerived.java
+++ b/src/org/python/core/PySuperDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyTupleDerived.java b/src/org/python/core/PyTupleDerived.java
--- a/src/org/python/core/PyTupleDerived.java
+++ b/src/org/python/core/PyTupleDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/core/PyType.java b/src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java
+++ b/src/org/python/core/PyType.java
@@ -47,7 +47,7 @@
     protected PyObject[] bases = new PyObject[0];
 
     /** The real, internal __dict__. */
-    protected AbstractDict dict;
+    protected PyObject dict;
 
     /** __mro__, the method resolution. order */
     protected PyObject[] mro;
@@ -189,7 +189,7 @@
         dict = ((AbstractDict) dict).copy();
         type.name = name;
         type.bases = tmpBases.length == 0 ? new PyObject[] {PyObject.TYPE} : tmpBases;
-        type.dict = (AbstractDict) dict;
+        type.dict = dict;
         type.tp_flags = Py.TPFLAGS_HEAPTYPE | Py.TPFLAGS_BASETYPE;
         // Enable defining a custom __dict__ via a property, method, or other descriptor
         boolean defines_dict = dict.__finditem__("__dict__") != null;
@@ -891,7 +891,7 @@
         }
     }
 
-    public PyStringMap instDict() {
+    public PyObject instDict() {
         if (needs_userdict) {
             return new PyStringMap();
         }
@@ -1754,7 +1754,7 @@
      * through {@link #addMethod} and {@link #removeMethod}, or unexpected mro errors can occur.
      */
     @Override
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
diff --git a/src/org/python/core/PyUnicodeDerived.java b/src/org/python/core/PyUnicodeDerived.java
--- a/src/org/python/core/PyUnicodeDerived.java
+++ b/src/org/python/core/PyUnicodeDerived.java
@@ -46,19 +46,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/expose/BaseTypeBuilder.java b/src/org/python/expose/BaseTypeBuilder.java
--- a/src/org/python/expose/BaseTypeBuilder.java
+++ b/src/org/python/expose/BaseTypeBuilder.java
@@ -6,7 +6,6 @@
 import org.python.core.PyNewWrapper;
 import org.python.core.PyObject;
 import org.python.core.PyStringMap;
-import org.python.core.AbstractDict;
 import org.python.core.PyType;
 
 public class BaseTypeBuilder implements TypeBuilder {
@@ -46,7 +45,7 @@
     }
 
     @Override
-    public PyStringMap getDict(PyType type) {
+    public PyObject getDict(PyType type) {
         PyStringMap dict = new PyStringMap();
         for(PyBuiltinMethod func : meths) {
             PyMethodDescr pmd = func.makeDescriptor(type);
diff --git a/src/org/python/expose/TypeBuilder.java b/src/org/python/expose/TypeBuilder.java
--- a/src/org/python/expose/TypeBuilder.java
+++ b/src/org/python/expose/TypeBuilder.java
@@ -1,7 +1,6 @@
 package org.python.expose;
 
 import org.python.core.PyObject;
-import org.python.core.AbstractDict;
 import org.python.core.PyType;
 
 /**
@@ -11,7 +10,7 @@
 
     public String getName();
 
-    public AbstractDict getDict(PyType type);
+    public PyObject getDict(PyType type);
 
     public Class<? extends PyObject> getTypeClass();
 
diff --git a/src/org/python/modules/PyStructDerived.java b/src/org/python/modules/PyStructDerived.java
--- a/src/org/python/modules/PyStructDerived.java
+++ b/src/org/python/modules/PyStructDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_collections/PyDefaultDictDerived.java b/src/org/python/modules/_collections/PyDefaultDictDerived.java
--- a/src/org/python/modules/_collections/PyDefaultDictDerived.java
+++ b/src/org/python/modules/_collections/PyDefaultDictDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_collections/PyDequeDerived.java b/src/org/python/modules/_collections/PyDequeDerived.java
--- a/src/org/python/modules/_collections/PyDequeDerived.java
+++ b/src/org/python/modules/_collections/PyDequeDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_functools/PyPartial.java b/src/org/python/modules/_functools/PyPartial.java
--- a/src/org/python/modules/_functools/PyPartial.java
+++ b/src/org/python/modules/_functools/PyPartial.java
@@ -36,7 +36,7 @@
     private String[] keywords;
 
     /** Lazily created dict for extra attributes. */
-    private AbstractDict __dict__;
+    private PyObject __dict__;
 
     public PyPartial() {
         super(TYPE);
@@ -163,7 +163,7 @@
     }
 
     @Override
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return __dict__;
     }
 
@@ -180,7 +180,7 @@
         if (!(val instanceof AbstractDict)) {
             throw Py.TypeError("setting partial object's dictionary to a non-dict");
         }
-        __dict__ = (AbstractDict) val;
+        __dict__ = val;
     }
 
     private void ensureDict() {
diff --git a/src/org/python/modules/_functools/PyPartialDerived.java b/src/org/python/modules/_functools/PyPartialDerived.java
--- a/src/org/python/modules/_functools/PyPartialDerived.java
+++ b/src/org/python/modules/_functools/PyPartialDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/_weakref/ReferenceTypeDerived.java b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
--- a/src/org/python/modules/_weakref/ReferenceTypeDerived.java
+++ b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/bz2/PyBZ2CompressorDerived.java b/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
--- a/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java b/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
--- a/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/bz2/PyBZ2FileDerived.java b/src/org/python/modules/bz2/PyBZ2FileDerived.java
--- a/src/org/python/modules/bz2/PyBZ2FileDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2FileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/PyTeeIteratorDerived.java b/src/org/python/modules/itertools/PyTeeIteratorDerived.java
--- a/src/org/python/modules/itertools/PyTeeIteratorDerived.java
+++ b/src/org/python/modules/itertools/PyTeeIteratorDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/chainDerived.java b/src/org/python/modules/itertools/chainDerived.java
--- a/src/org/python/modules/itertools/chainDerived.java
+++ b/src/org/python/modules/itertools/chainDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/combinationsDerived.java b/src/org/python/modules/itertools/combinationsDerived.java
--- a/src/org/python/modules/itertools/combinationsDerived.java
+++ b/src/org/python/modules/itertools/combinationsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/combinationsWithReplacementDerived.java b/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
--- a/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
+++ b/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/compressDerived.java b/src/org/python/modules/itertools/compressDerived.java
--- a/src/org/python/modules/itertools/compressDerived.java
+++ b/src/org/python/modules/itertools/compressDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/countDerived.java b/src/org/python/modules/itertools/countDerived.java
--- a/src/org/python/modules/itertools/countDerived.java
+++ b/src/org/python/modules/itertools/countDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/cycleDerived.java b/src/org/python/modules/itertools/cycleDerived.java
--- a/src/org/python/modules/itertools/cycleDerived.java
+++ b/src/org/python/modules/itertools/cycleDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/dropwhileDerived.java b/src/org/python/modules/itertools/dropwhileDerived.java
--- a/src/org/python/modules/itertools/dropwhileDerived.java
+++ b/src/org/python/modules/itertools/dropwhileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/groupbyDerived.java b/src/org/python/modules/itertools/groupbyDerived.java
--- a/src/org/python/modules/itertools/groupbyDerived.java
+++ b/src/org/python/modules/itertools/groupbyDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/ifilterDerived.java b/src/org/python/modules/itertools/ifilterDerived.java
--- a/src/org/python/modules/itertools/ifilterDerived.java
+++ b/src/org/python/modules/itertools/ifilterDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/ifilterfalseDerived.java b/src/org/python/modules/itertools/ifilterfalseDerived.java
--- a/src/org/python/modules/itertools/ifilterfalseDerived.java
+++ b/src/org/python/modules/itertools/ifilterfalseDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/isliceDerived.java b/src/org/python/modules/itertools/isliceDerived.java
--- a/src/org/python/modules/itertools/isliceDerived.java
+++ b/src/org/python/modules/itertools/isliceDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/izipDerived.java b/src/org/python/modules/itertools/izipDerived.java
--- a/src/org/python/modules/itertools/izipDerived.java
+++ b/src/org/python/modules/itertools/izipDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/izipLongestDerived.java b/src/org/python/modules/itertools/izipLongestDerived.java
--- a/src/org/python/modules/itertools/izipLongestDerived.java
+++ b/src/org/python/modules/itertools/izipLongestDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/permutationsDerived.java b/src/org/python/modules/itertools/permutationsDerived.java
--- a/src/org/python/modules/itertools/permutationsDerived.java
+++ b/src/org/python/modules/itertools/permutationsDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/productDerived.java b/src/org/python/modules/itertools/productDerived.java
--- a/src/org/python/modules/itertools/productDerived.java
+++ b/src/org/python/modules/itertools/productDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/repeatDerived.java b/src/org/python/modules/itertools/repeatDerived.java
--- a/src/org/python/modules/itertools/repeatDerived.java
+++ b/src/org/python/modules/itertools/repeatDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/starmapDerived.java b/src/org/python/modules/itertools/starmapDerived.java
--- a/src/org/python/modules/itertools/starmapDerived.java
+++ b/src/org/python/modules/itertools/starmapDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/itertools/takewhileDerived.java b/src/org/python/modules/itertools/takewhileDerived.java
--- a/src/org/python/modules/itertools/takewhileDerived.java
+++ b/src/org/python/modules/itertools/takewhileDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/random/PyRandomDerived.java b/src/org/python/modules/random/PyRandomDerived.java
--- a/src/org/python/modules/random/PyRandomDerived.java
+++ b/src/org/python/modules/random/PyRandomDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/org/python/modules/zipimport/zipimporterDerived.java b/src/org/python/modules/zipimport/zipimporterDerived.java
--- a/src/org/python/modules/zipimport/zipimporterDerived.java
+++ b/src/org/python/modules/zipimport/zipimporterDerived.java
@@ -47,19 +47,19 @@
 
     /* end of TraverseprocDerived implementation */
 
-    private AbstractDict dict;
+    private PyObject dict;
 
-    public AbstractDict fastGetDict() {
+    public PyObject fastGetDict() {
         return dict;
     }
 
-    public AbstractDict getDict() {
+    public PyObject getDict() {
         return dict;
     }
 
     public void setDict(PyObject newDict) {
         if (newDict instanceof AbstractDict) {
-            dict=(AbstractDict)newDict;
+            dict=newDict;
             if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
                 FinalizeTrigger.ensureFinalizer(this);
             }
diff --git a/src/templates/gderived-defs b/src/templates/gderived-defs
--- a/src/templates/gderived-defs
+++ b/src/templates/gderived-defs
@@ -98,19 +98,19 @@
     return super.`unary();
   }
 define: (ClassBodyDeclarations)userdict
-  private AbstractDict dict;
+  private PyObject dict;
 
-  public AbstractDict fastGetDict() {
+  public PyObject fastGetDict() {
     return dict;
   }
 
-  public AbstractDict getDict() {
+  public PyObject getDict() {
     return dict;
   }
 
   public void setDict(PyObject newDict) {
     if (newDict instanceof AbstractDict) {
-      dict = (AbstractDict) newDict;
+      dict = newDict;
       if (dict.__finditem__(PyString.fromInterned("__del__")) != null &&
         !JyAttribute.hasAttr(this, JyAttribute.FINALIZE_TRIGGER_ATTR)) {
         FinalizeTrigger.ensureFinalizer(this);

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

From jython-checkins at python.org  Mon Jan  9 03:28:36 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 08:28:36 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Let_getattr=28types=2ETypeT?=
 =?utf-8?q?ype=2C_=27=5F=5Fabstractmethods=5F=5F=27=29_raise_AttributeErro?=
 =?utf-8?q?r_like?=
Message-ID: <20170109082836.20010.57495.1DE982E6@psf.io>

https://hg.python.org/jython/rev/5e27a3634428
changeset:   7993:5e27a3634428
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 09:28:29 2017 +0100
summary:
  Let getattr(types.TypeType, '__abstractmethods__') raise AttributeError like CPython would do. So far Jython returned the getset_descriptor, which causes trouble in abc.py, because __abstractmethods__ is expected to be iterable or raise AttributeError. Partial fix for issue 2515, see http://bugs.jython.org/issue2515 for details.

files:
  src/org/python/core/PyType.java |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/src/org/python/core/PyType.java b/src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java
+++ b/src/org/python/core/PyType.java
@@ -1824,7 +1824,7 @@
     @ExposedGet(name = "__abstractmethods__")
     public PyObject getAbstractmethods() {
         PyObject result = dict.__finditem__("__abstractmethods__");
-        if (result == null) {
+        if (result == null || result instanceof PyDataDescr) {
             noAttributeError("__abstractmethods__");
         }
         return result;

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

From jython-checkins at python.org  Mon Jan  9 04:15:19 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 09:15:19 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Added_tests_for_large_metho?=
 =?utf-8?q?ds_and_functions_that_exceed_JVM_method-size?=
Message-ID: <20170109091519.27510.56332.B3822DB3@psf.io>

https://hg.python.org/jython/rev/86411e78fda0
changeset:   7994:86411e78fda0
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 10:15:06 2017 +0100
summary:
  Added tests for large methods and functions that exceed JVM method-size restriction.

files:
  Lib/test/test_large_method_bytecode_jy.py |  87 +++++++++++
  NEWS                                      |   1 +
  src/org/python/compiler/Module.java       |   7 +-
  3 files changed, 91 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_large_method_bytecode_jy.py b/Lib/test/test_large_method_bytecode_jy.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/test_large_method_bytecode_jy.py
@@ -0,0 +1,87 @@
+"""
+Tests Jython's capability to handle Python-functions and
+methods that are so long that their JVM-bytecode exceeds
+JVM method size restrictions.
+The case that the main module code exceeds maximal length
+is somewhat special, so it is explicitly tested.
+
+Note: As of this writing, a CPython 2.7 bytecode-file (.pyc)
+      is required for each module that contains an oversized
+      function. The pyc-file is only required at compile-time
+      in the sense that if you pre-compile py-files to classes,
+      you won't need to distribute the pyc-file; it gets
+      embedded into the class-file.
+"""
+
+import unittest
+from test import test_support
+
+class large_method_tests(unittest.TestCase):
+    '''Tests some oversized functions and methods.
+    '''
+
+    @classmethod
+    def setUpClass(cls):
+        import large_methods as _large_methods
+        global large_methods
+        large_methods = _large_methods
+
+    def test_large_func(self):
+        '''Tests a function that slightly exceeds maximal JMV method
+        length. It is internally represented as CPython bytecode.
+        '''
+        self.assertEqual(large_methods.large_function(), 'large 2300')
+
+    def test_large_method(self):
+        '''Tests a method that slightly exceeds maximal JMV method
+        length. It is internally represented as CPython bytecode.
+        '''
+        cl = large_methods.OversizedMethodHolder()
+        self.assertEqual(cl.large_function(), 'large_method 2300')
+
+    def test_very_large_func(self):
+        '''Here we test a function that is so large that its Python bytecode
+        exceeds maximal String-literal length. It is automatically split up
+        into several literals.
+        '''
+        self.assertEqual(large_methods.very_large_function(), 'very large 58900')
+
+    def test_small_func(self):
+        '''We assert that ordinary-sized, i.e. JVM-bytecode methods still work
+        in context of PyBytecode.
+        '''
+        self.assertEqual(large_methods.small_function(), 'small 10')
+
+class large_module_tests(unittest.TestCase):
+    '''Tests a module with oversized main-code.
+    So the whole module is represented as a single PyBytecode object.
+    Additionally same tests as in large_method_tests are applied.
+    '''
+
+    @classmethod
+    def setUpClass(cls):
+        import large_module as _large_module
+        global large_module
+        large_module = _large_module
+
+    def test_large_module_main(self):
+        '''Tests the module's oversized main-code.
+        '''
+        self.assertEqual(large_module.count, 2310)
+
+    def test_large_module_method(self):
+        cl2 = large_module.OversizedMethodHolder()
+        self.assertEqual(cl2.large_function(), 'large_method 2300')
+
+    def test_large_module_large_func(self):
+        self.assertEqual(large_module.large_function(), 'large 2300')
+
+    def test_large_module_very_large_func(self):
+        self.assertEqual(large_module.very_large_function(), 'very large 58900')
+
+    def test_large_module_small_func(self):
+        self.assertEqual(large_module.small_function(), 'small 10')
+
+if __name__ == "__main__":
+    unittest.main()
+
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2515 ] typing module doesn't import
     - [ 2538 ] Test failures in test_unittest
     - [ 2293 ] "java.lang.IllegalArgumentException: java.lang.IllegalArgumentException:
                Cannot create PyString with non-byte value" triggered after adding
diff --git a/src/org/python/compiler/Module.java b/src/org/python/compiler/Module.java
--- a/src/org/python/compiler/Module.java
+++ b/src/org/python/compiler/Module.java
@@ -859,13 +859,12 @@
                             // Probably this cannot yield cycles, so cycle-proof stuff
                             // is out-commented for now. (everything regarding 'allCodes')
                             PyBytecode bcode = buffer.pop();
-                            //System.out.println("PyBytecode: "+bcode.co_name+" of size "+bcode.co_code.length);
                             if (bcode.co_code.length > thresh) {
                                 largest_m_codes.add(bcode);
                             } else {
-                                // If a function needs to be done as bytecode, we create all inner
-                                // PyCode-items (classes, functions, methods) also as bytecode
-                                // implicitly, so no need so look at them individually.
+                                // If a function needs to be represented as CPython bytecode, we create
+                                // all inner PyCode-items (classes, functions, methods) also as CPython
+                                // bytecode implicitly, so no need so look at them individually.
                                 // Maybe we can later optimize this such that inner methods can be
                                 // JVM-bytecode as well (if not oversized themselves).
                                 for (PyObject item: bcode.co_consts) {

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

From jython-checkins at python.org  Mon Jan  9 04:26:39 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 09:26:39 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Fixes_=232515_together_with?=
 =?utf-8?q?_previous_commit=2E_Py=2EdispatchToChecker_didn=27t_consider?=
Message-ID: <20170109092639.53458.6752.A9CC6B81@psf.io>

https://hg.python.org/jython/rev/57d5d84099db
changeset:   7995:57d5d84099db
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 10:26:28 2017 +0100
summary:
  Fixes #2515 together with previous commit. Py.dispatchToChecker didn't consider the metaclass for __instancecheck__ and __subclasscheck__, but according to https://docs.python.org/2/reference/datamodel.html#customizing-instance-and-subclass-checks these methods must be defined in a metaclass only. Also see http://bugs.jython.org/issue2515 for details.

files:
  src/org/python/core/Py.java |  12 +++++++-----
  1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/src/org/python/core/Py.java b/src/org/python/core/Py.java
--- a/src/org/python/core/Py.java
+++ b/src/org/python/core/Py.java
@@ -2259,18 +2259,20 @@
      * checker
      */
     private static PyObject dispatchToChecker(PyObject checkerArg, PyObject cls,
-                                              String checkerName) {
+            String checkerName) {
         //Ignore old style classes.
         if (cls instanceof PyClass) {
             return null;
         }
-
-        PyObject checker = cls.__findattr__(checkerName);
+        PyObject meta = cls.__findattr__("__metaclass__");
+        if (meta == null) {
+            return null;
+        }
+        PyObject checker = meta.__findattr__(checkerName);
         if (checker == null) {
             return null;
         }
-
-        return checker.__call__(checkerArg);
+        return checker.__call__(cls, checkerArg);
     }
 
     /**

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

From jython-checkins at python.org  Mon Jan  9 09:06:34 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 14:06:34 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Cleaned_some_unused_imports?=
 =?utf-8?q?=2E?=
Message-ID: <20170109140632.93465.63680.6473360B@psf.io>

https://hg.python.org/jython/rev/f37fbf0ef3b6
changeset:   7996:f37fbf0ef3b6
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 15:06:12 2017 +0100
summary:
  Cleaned some unused imports.

files:
  src/org/python/antlr/BaseParser.java           |   1 -
  src/org/python/antlr/adapter/AstAdapter.java   |   2 +-
  src/org/python/antlr/adapter/AstAdapters.java  |   4 +-
  src/org/python/antlr/ast/Assert.java           |  11 +----
  src/org/python/antlr/ast/Assign.java           |   9 +---
  src/org/python/antlr/ast/AstModule.java        |   4 -
  src/org/python/antlr/ast/Attribute.java        |  12 +----
  src/org/python/antlr/ast/AugAssign.java        |  11 +----
  src/org/python/antlr/ast/BinOp.java            |  12 +----
  src/org/python/antlr/ast/BoolOp.java           |  10 +---
  src/org/python/antlr/ast/Break.java            |  14 +-----
  src/org/python/antlr/ast/Call.java             |  10 +---
  src/org/python/antlr/ast/ClassDef.java         |   9 +---
  src/org/python/antlr/ast/Compare.java          |  10 +---
  src/org/python/antlr/ast/Continue.java         |  14 +-----
  src/org/python/antlr/ast/Delete.java           |   9 +---
  src/org/python/antlr/ast/Dict.java             |  10 +---
  src/org/python/antlr/ast/DictComp.java         |  10 +---
  src/org/python/antlr/ast/Ellipsis.java         |  15 +------
  src/org/python/antlr/ast/ErrorSlice.java       |   5 +-
  src/org/python/antlr/ast/ErrorStmt.java        |   5 +-
  src/org/python/antlr/ast/ExceptHandler.java    |   8 +---
  src/org/python/antlr/ast/Exec.java             |  11 +----
  src/org/python/antlr/ast/Expr.java             |  11 +----
  src/org/python/antlr/ast/Expression.java       |  11 +----
  src/org/python/antlr/ast/ExtSlice.java         |  10 +---
  src/org/python/antlr/ast/For.java              |   9 +---
  src/org/python/antlr/ast/FunctionDef.java      |   9 +---
  src/org/python/antlr/ast/GeneratorExp.java     |  10 +---
  src/org/python/antlr/ast/Global.java           |  11 +----
  src/org/python/antlr/ast/If.java               |   9 +---
  src/org/python/antlr/ast/IfExp.java            |  12 +----
  src/org/python/antlr/ast/Import.java           |  10 +---
  src/org/python/antlr/ast/ImportFrom.java       |  10 +---
  src/org/python/antlr/ast/Index.java            |  11 +----
  src/org/python/antlr/ast/Interactive.java      |   9 +---
  src/org/python/antlr/ast/Lambda.java           |  12 +----
  src/org/python/antlr/ast/List.java             |  10 +---
  src/org/python/antlr/ast/ListComp.java         |  10 +---
  src/org/python/antlr/ast/Module.java           |   9 +---
  src/org/python/antlr/ast/Name.java             |  12 +----
  src/org/python/antlr/ast/Num.java              |  12 +----
  src/org/python/antlr/ast/Pass.java             |  14 +-----
  src/org/python/antlr/ast/Print.java            |   9 +---
  src/org/python/antlr/ast/Raise.java            |  11 +----
  src/org/python/antlr/ast/Repr.java             |  12 +----
  src/org/python/antlr/ast/Return.java           |  11 +----
  src/org/python/antlr/ast/Set.java              |  10 +---
  src/org/python/antlr/ast/SetComp.java          |  10 +---
  src/org/python/antlr/ast/Slice.java            |  11 +----
  src/org/python/antlr/ast/Str.java              |  12 +----
  src/org/python/antlr/ast/Subscript.java        |  11 +----
  src/org/python/antlr/ast/Suite.java            |   9 +---
  src/org/python/antlr/ast/TryExcept.java        |   9 +---
  src/org/python/antlr/ast/TryFinally.java       |  10 +---
  src/org/python/antlr/ast/Tuple.java            |  10 +---
  src/org/python/antlr/ast/UnaryOp.java          |  12 +----
  src/org/python/antlr/ast/VisitorBase.java      |  23 +---------
  src/org/python/antlr/ast/While.java            |   9 +---
  src/org/python/antlr/ast/With.java             |   9 +---
  src/org/python/antlr/ast/Yield.java            |  12 +----
  src/org/python/antlr/ast/alias.java            |  12 +----
  src/org/python/antlr/ast/arguments.java        |   8 +---
  src/org/python/antlr/ast/boolopType.java       |   2 -
  src/org/python/antlr/ast/cmpopType.java        |   2 -
  src/org/python/antlr/ast/comprehension.java    |   8 +---
  src/org/python/antlr/ast/expr_contextType.java |   2 -
  src/org/python/antlr/ast/keyword.java          |  10 +---
  src/org/python/antlr/ast/operatorType.java     |   2 -
  src/org/python/antlr/ast/unaryopType.java      |   2 -
  src/org/python/antlr/base/boolop.java          |  16 +------
  src/org/python/antlr/base/cmpop.java           |  16 +------
  src/org/python/antlr/base/excepthandler.java   |  16 +------
  src/org/python/antlr/base/expr.java            |  16 +------
  src/org/python/antlr/base/expr_context.java    |  16 +------
  src/org/python/antlr/base/mod.java             |  16 +------
  src/org/python/antlr/base/operator.java        |  16 +------
  src/org/python/antlr/base/slice.java           |  16 +------
  src/org/python/antlr/base/stmt.java            |  16 +------
  src/org/python/antlr/base/unaryop.java         |  16 +------
  src/org/python/antlr/op/Add.java               |   2 -
  src/org/python/antlr/op/And.java               |   2 -
  src/org/python/antlr/op/AugLoad.java           |   2 -
  src/org/python/antlr/op/AugStore.java          |   2 -
  src/org/python/antlr/op/BitAnd.java            |   2 -
  src/org/python/antlr/op/BitOr.java             |   2 -
  src/org/python/antlr/op/BitXor.java            |   2 -
  src/org/python/antlr/op/Del.java               |   2 -
  src/org/python/antlr/op/Div.java               |   2 -
  src/org/python/antlr/op/Eq.java                |   2 -
  src/org/python/antlr/op/FloorDiv.java          |   2 -
  src/org/python/antlr/op/Gt.java                |   2 -
  src/org/python/antlr/op/GtE.java               |   2 -
  src/org/python/antlr/op/In.java                |   2 -
  src/org/python/antlr/op/Invert.java            |   2 -
  src/org/python/antlr/op/Is.java                |   2 -
  src/org/python/antlr/op/IsNot.java             |   2 -
  src/org/python/antlr/op/LShift.java            |   2 -
  src/org/python/antlr/op/Load.java              |   2 -
  src/org/python/antlr/op/Lt.java                |   2 -
  src/org/python/antlr/op/LtE.java               |   2 -
  src/org/python/antlr/op/Mod.java               |   2 -
  src/org/python/antlr/op/Mult.java              |   2 -
  src/org/python/antlr/op/Not.java               |   2 -
  src/org/python/antlr/op/NotEq.java             |   2 -
  src/org/python/antlr/op/NotIn.java             |   2 -
  src/org/python/antlr/op/Or.java                |   2 -
  src/org/python/antlr/op/Param.java             |   2 -
  src/org/python/antlr/op/Pow.java               |   2 -
  src/org/python/antlr/op/RShift.java            |   2 -
  src/org/python/antlr/op/Store.java             |   2 -
  src/org/python/antlr/op/Sub.java               |   2 -
  src/org/python/antlr/op/UAdd.java              |   2 -
  src/org/python/antlr/op/USub.java              |   2 -
  114 files changed, 74 insertions(+), 819 deletions(-)


diff --git a/src/org/python/antlr/BaseParser.java b/src/org/python/antlr/BaseParser.java
--- a/src/org/python/antlr/BaseParser.java
+++ b/src/org/python/antlr/BaseParser.java
@@ -3,7 +3,6 @@
 import org.antlr.runtime.CharStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
 import org.python.antlr.base.mod;
 
 public class BaseParser {
diff --git a/src/org/python/antlr/adapter/AstAdapter.java b/src/org/python/antlr/adapter/AstAdapter.java
--- a/src/org/python/antlr/adapter/AstAdapter.java
+++ b/src/org/python/antlr/adapter/AstAdapter.java
@@ -1,8 +1,8 @@
 package org.python.antlr.adapter;
 
 import org.python.core.PyObject;
+import java.util.List;
 
-import java.util.List;
 /**
  * AstAdapters turn Objects into Ast nodes.
  */
diff --git a/src/org/python/antlr/adapter/AstAdapters.java b/src/org/python/antlr/adapter/AstAdapters.java
--- a/src/org/python/antlr/adapter/AstAdapters.java
+++ b/src/org/python/antlr/adapter/AstAdapters.java
@@ -5,10 +5,10 @@
 import org.python.antlr.op.*;
 import org.python.core.*;
 
-import java.util.ArrayList;
 /**
  * AstAdapter turns Python and Java objects into ast nodes.
  */
+ at SuppressWarnings("unchecked")
 public class AstAdapters {
     public final static AliasAdapter aliasAdapter = new AliasAdapter();
     public final static CmpopAdapter cmpopAdapter = new CmpopAdapter();
@@ -20,7 +20,7 @@
     public final static SliceAdapter sliceAdapter = new SliceAdapter();
     public final static StmtAdapter stmtAdapter = new StmtAdapter();
 
-    public static java.util.List<alias> py2aliasList(PyObject o) {
+	public static java.util.List<alias> py2aliasList(PyObject o) {
         return (java.util.List<alias>)aliasAdapter.iter2ast(o);
     }
 
diff --git a/src/org/python/antlr/ast/Assert.java b/src/org/python/antlr/ast/Assert.java
--- a/src/org/python/antlr/ast/Assert.java
+++ b/src/org/python/antlr/ast/Assert.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Assert", base = stmt.class)
 public class Assert extends stmt {
diff --git a/src/org/python/antlr/ast/Assign.java b/src/org/python/antlr/ast/Assign.java
--- a/src/org/python/antlr/ast/Assign.java
+++ b/src/org/python/antlr/ast/Assign.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Assign", base = stmt.class)
diff --git a/src/org/python/antlr/ast/AstModule.java b/src/org/python/antlr/ast/AstModule.java
--- a/src/org/python/antlr/ast/AstModule.java
+++ b/src/org/python/antlr/ast/AstModule.java
@@ -5,15 +5,11 @@
 import org.python.core.AstList;
 import org.python.core.ClassDictInit;
 import org.python.core.CompilerFlags;
-import org.python.core.imp;
 import org.python.core.Py;
 import org.python.core.PyInteger;
 import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyType;
-
 import org.python.antlr.AST;
-import org.python.core.exceptions;
 
 public class AstModule implements ClassDictInit {
 
diff --git a/src/org/python/antlr/ast/Attribute.java b/src/org/python/antlr/ast/Attribute.java
--- a/src/org/python/antlr/ast/Attribute.java
+++ b/src/org/python/antlr/ast/Attribute.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Attribute", base = expr.class)
 public class Attribute extends expr implements Context {
diff --git a/src/org/python/antlr/ast/AugAssign.java b/src/org/python/antlr/ast/AugAssign.java
--- a/src/org/python/antlr/ast/AugAssign.java
+++ b/src/org/python/antlr/ast/AugAssign.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.AugAssign", base = stmt.class)
 public class AugAssign extends stmt {
diff --git a/src/org/python/antlr/ast/BinOp.java b/src/org/python/antlr/ast/BinOp.java
--- a/src/org/python/antlr/ast/BinOp.java
+++ b/src/org/python/antlr/ast/BinOp.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.BinOp", base = expr.class)
 public class BinOp extends expr {
diff --git a/src/org/python/antlr/ast/BoolOp.java b/src/org/python/antlr/ast/BoolOp.java
--- a/src/org/python/antlr/ast/BoolOp.java
+++ b/src/org/python/antlr/ast/BoolOp.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.BoolOp", base = expr.class)
diff --git a/src/org/python/antlr/ast/Break.java b/src/org/python/antlr/ast/Break.java
--- a/src/org/python/antlr/ast/Break.java
+++ b/src/org/python/antlr/ast/Break.java
@@ -1,31 +1,19 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Break", base = stmt.class)
 public class Break extends stmt {
diff --git a/src/org/python/antlr/ast/Call.java b/src/org/python/antlr/ast/Call.java
--- a/src/org/python/antlr/ast/Call.java
+++ b/src/org/python/antlr/ast/Call.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Call", base = expr.class)
diff --git a/src/org/python/antlr/ast/ClassDef.java b/src/org/python/antlr/ast/ClassDef.java
--- a/src/org/python/antlr/ast/ClassDef.java
+++ b/src/org/python/antlr/ast/ClassDef.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.ClassDef", base = stmt.class)
diff --git a/src/org/python/antlr/ast/Compare.java b/src/org/python/antlr/ast/Compare.java
--- a/src/org/python/antlr/ast/Compare.java
+++ b/src/org/python/antlr/ast/Compare.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Compare", base = expr.class)
diff --git a/src/org/python/antlr/ast/Continue.java b/src/org/python/antlr/ast/Continue.java
--- a/src/org/python/antlr/ast/Continue.java
+++ b/src/org/python/antlr/ast/Continue.java
@@ -1,31 +1,19 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Continue", base = stmt.class)
 public class Continue extends stmt {
diff --git a/src/org/python/antlr/ast/Delete.java b/src/org/python/antlr/ast/Delete.java
--- a/src/org/python/antlr/ast/Delete.java
+++ b/src/org/python/antlr/ast/Delete.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Delete", base = stmt.class)
diff --git a/src/org/python/antlr/ast/Dict.java b/src/org/python/antlr/ast/Dict.java
--- a/src/org/python/antlr/ast/Dict.java
+++ b/src/org/python/antlr/ast/Dict.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Dict", base = expr.class)
diff --git a/src/org/python/antlr/ast/DictComp.java b/src/org/python/antlr/ast/DictComp.java
--- a/src/org/python/antlr/ast/DictComp.java
+++ b/src/org/python/antlr/ast/DictComp.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.DictComp", base = expr.class)
diff --git a/src/org/python/antlr/ast/Ellipsis.java b/src/org/python/antlr/ast/Ellipsis.java
--- a/src/org/python/antlr/ast/Ellipsis.java
+++ b/src/org/python/antlr/ast/Ellipsis.java
@@ -1,31 +1,18 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
 import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Ellipsis", base = slice.class)
 public class Ellipsis extends slice {
diff --git a/src/org/python/antlr/ast/ErrorSlice.java b/src/org/python/antlr/ast/ErrorSlice.java
--- a/src/org/python/antlr/ast/ErrorSlice.java
+++ b/src/org/python/antlr/ast/ErrorSlice.java
@@ -1,10 +1,7 @@
 package org.python.antlr.ast;
+
 import org.python.antlr.PythonTree;
 import org.python.antlr.base.slice;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.Token;
-import java.io.DataOutputStream;
-import java.io.IOException;
 
 public class ErrorSlice extends slice {
 
diff --git a/src/org/python/antlr/ast/ErrorStmt.java b/src/org/python/antlr/ast/ErrorStmt.java
--- a/src/org/python/antlr/ast/ErrorStmt.java
+++ b/src/org/python/antlr/ast/ErrorStmt.java
@@ -1,10 +1,7 @@
 package org.python.antlr.ast;
+
 import org.python.antlr.PythonTree;
 import org.python.antlr.base.stmt;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.Token;
-import java.io.DataOutputStream;
-import java.io.IOException;
 
 public class ErrorStmt extends stmt {
 
diff --git a/src/org/python/antlr/ast/ExceptHandler.java b/src/org/python/antlr/ast/ExceptHandler.java
--- a/src/org/python/antlr/ast/ExceptHandler.java
+++ b/src/org/python/antlr/ast/ExceptHandler.java
@@ -1,14 +1,11 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
 import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +14,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.ExceptHandler", base = excepthandler.class)
diff --git a/src/org/python/antlr/ast/Exec.java b/src/org/python/antlr/ast/Exec.java
--- a/src/org/python/antlr/ast/Exec.java
+++ b/src/org/python/antlr/ast/Exec.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Exec", base = stmt.class)
 public class Exec extends stmt {
diff --git a/src/org/python/antlr/ast/Expr.java b/src/org/python/antlr/ast/Expr.java
--- a/src/org/python/antlr/ast/Expr.java
+++ b/src/org/python/antlr/ast/Expr.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Expr", base = stmt.class)
 public class Expr extends stmt {
diff --git a/src/org/python/antlr/ast/Expression.java b/src/org/python/antlr/ast/Expression.java
--- a/src/org/python/antlr/ast/Expression.java
+++ b/src/org/python/antlr/ast/Expression.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
 import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Expression", base = mod.class)
 public class Expression extends mod {
diff --git a/src/org/python/antlr/ast/ExtSlice.java b/src/org/python/antlr/ast/ExtSlice.java
--- a/src/org/python/antlr/ast/ExtSlice.java
+++ b/src/org/python/antlr/ast/ExtSlice.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
 import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.ExtSlice", base = slice.class)
diff --git a/src/org/python/antlr/ast/For.java b/src/org/python/antlr/ast/For.java
--- a/src/org/python/antlr/ast/For.java
+++ b/src/org/python/antlr/ast/For.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.For", base = stmt.class)
diff --git a/src/org/python/antlr/ast/FunctionDef.java b/src/org/python/antlr/ast/FunctionDef.java
--- a/src/org/python/antlr/ast/FunctionDef.java
+++ b/src/org/python/antlr/ast/FunctionDef.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.FunctionDef", base = stmt.class)
diff --git a/src/org/python/antlr/ast/GeneratorExp.java b/src/org/python/antlr/ast/GeneratorExp.java
--- a/src/org/python/antlr/ast/GeneratorExp.java
+++ b/src/org/python/antlr/ast/GeneratorExp.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.GeneratorExp", base = expr.class)
diff --git a/src/org/python/antlr/ast/Global.java b/src/org/python/antlr/ast/Global.java
--- a/src/org/python/antlr/ast/Global.java
+++ b/src/org/python/antlr/ast/Global.java
@@ -1,14 +1,9 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,15 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Global", base = stmt.class)
 public class Global extends stmt {
diff --git a/src/org/python/antlr/ast/If.java b/src/org/python/antlr/ast/If.java
--- a/src/org/python/antlr/ast/If.java
+++ b/src/org/python/antlr/ast/If.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.If", base = stmt.class)
diff --git a/src/org/python/antlr/ast/IfExp.java b/src/org/python/antlr/ast/IfExp.java
--- a/src/org/python/antlr/ast/IfExp.java
+++ b/src/org/python/antlr/ast/IfExp.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.IfExp", base = expr.class)
 public class IfExp extends expr {
diff --git a/src/org/python/antlr/ast/Import.java b/src/org/python/antlr/ast/Import.java
--- a/src/org/python/antlr/ast/Import.java
+++ b/src/org/python/antlr/ast/Import.java
@@ -1,14 +1,9 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Import", base = stmt.class)
diff --git a/src/org/python/antlr/ast/ImportFrom.java b/src/org/python/antlr/ast/ImportFrom.java
--- a/src/org/python/antlr/ast/ImportFrom.java
+++ b/src/org/python/antlr/ast/ImportFrom.java
@@ -1,14 +1,9 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.ImportFrom", base = stmt.class)
diff --git a/src/org/python/antlr/ast/Index.java b/src/org/python/antlr/ast/Index.java
--- a/src/org/python/antlr/ast/Index.java
+++ b/src/org/python/antlr/ast/Index.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
 import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Index", base = slice.class)
 public class Index extends slice {
diff --git a/src/org/python/antlr/ast/Interactive.java b/src/org/python/antlr/ast/Interactive.java
--- a/src/org/python/antlr/ast/Interactive.java
+++ b/src/org/python/antlr/ast/Interactive.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
 import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Interactive", base = mod.class)
diff --git a/src/org/python/antlr/ast/Lambda.java b/src/org/python/antlr/ast/Lambda.java
--- a/src/org/python/antlr/ast/Lambda.java
+++ b/src/org/python/antlr/ast/Lambda.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Lambda", base = expr.class)
 public class Lambda extends expr {
diff --git a/src/org/python/antlr/ast/List.java b/src/org/python/antlr/ast/List.java
--- a/src/org/python/antlr/ast/List.java
+++ b/src/org/python/antlr/ast/List.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.List", base = expr.class)
diff --git a/src/org/python/antlr/ast/ListComp.java b/src/org/python/antlr/ast/ListComp.java
--- a/src/org/python/antlr/ast/ListComp.java
+++ b/src/org/python/antlr/ast/ListComp.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.ListComp", base = expr.class)
diff --git a/src/org/python/antlr/ast/Module.java b/src/org/python/antlr/ast/Module.java
--- a/src/org/python/antlr/ast/Module.java
+++ b/src/org/python/antlr/ast/Module.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
 import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Module", base = mod.class)
diff --git a/src/org/python/antlr/ast/Name.java b/src/org/python/antlr/ast/Name.java
--- a/src/org/python/antlr/ast/Name.java
+++ b/src/org/python/antlr/ast/Name.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Name", base = expr.class)
 public class Name extends expr implements Context {
diff --git a/src/org/python/antlr/ast/Num.java b/src/org/python/antlr/ast/Num.java
--- a/src/org/python/antlr/ast/Num.java
+++ b/src/org/python/antlr/ast/Num.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Num", base = expr.class)
 public class Num extends expr {
diff --git a/src/org/python/antlr/ast/Pass.java b/src/org/python/antlr/ast/Pass.java
--- a/src/org/python/antlr/ast/Pass.java
+++ b/src/org/python/antlr/ast/Pass.java
@@ -1,31 +1,19 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Pass", base = stmt.class)
 public class Pass extends stmt {
diff --git a/src/org/python/antlr/ast/Print.java b/src/org/python/antlr/ast/Print.java
--- a/src/org/python/antlr/ast/Print.java
+++ b/src/org/python/antlr/ast/Print.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Print", base = stmt.class)
diff --git a/src/org/python/antlr/ast/Raise.java b/src/org/python/antlr/ast/Raise.java
--- a/src/org/python/antlr/ast/Raise.java
+++ b/src/org/python/antlr/ast/Raise.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Raise", base = stmt.class)
 public class Raise extends stmt {
diff --git a/src/org/python/antlr/ast/Repr.java b/src/org/python/antlr/ast/Repr.java
--- a/src/org/python/antlr/ast/Repr.java
+++ b/src/org/python/antlr/ast/Repr.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Repr", base = expr.class)
 public class Repr extends expr {
diff --git a/src/org/python/antlr/ast/Return.java b/src/org/python/antlr/ast/Return.java
--- a/src/org/python/antlr/ast/Return.java
+++ b/src/org/python/antlr/ast/Return.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Return", base = stmt.class)
 public class Return extends stmt {
diff --git a/src/org/python/antlr/ast/Set.java b/src/org/python/antlr/ast/Set.java
--- a/src/org/python/antlr/ast/Set.java
+++ b/src/org/python/antlr/ast/Set.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Set", base = expr.class)
diff --git a/src/org/python/antlr/ast/SetComp.java b/src/org/python/antlr/ast/SetComp.java
--- a/src/org/python/antlr/ast/SetComp.java
+++ b/src/org/python/antlr/ast/SetComp.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.SetComp", base = expr.class)
diff --git a/src/org/python/antlr/ast/Slice.java b/src/org/python/antlr/ast/Slice.java
--- a/src/org/python/antlr/ast/Slice.java
+++ b/src/org/python/antlr/ast/Slice.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
 import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Slice", base = slice.class)
 public class Slice extends slice {
diff --git a/src/org/python/antlr/ast/Str.java b/src/org/python/antlr/ast/Str.java
--- a/src/org/python/antlr/ast/Str.java
+++ b/src/org/python/antlr/ast/Str.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Str", base = expr.class)
 public class Str extends expr {
diff --git a/src/org/python/antlr/ast/Subscript.java b/src/org/python/antlr/ast/Subscript.java
--- a/src/org/python/antlr/ast/Subscript.java
+++ b/src/org/python/antlr/ast/Subscript.java
@@ -1,31 +1,22 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
 import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Subscript", base = expr.class)
 public class Subscript extends expr implements Context {
diff --git a/src/org/python/antlr/ast/Suite.java b/src/org/python/antlr/ast/Suite.java
--- a/src/org/python/antlr/ast/Suite.java
+++ b/src/org/python/antlr/ast/Suite.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
 import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Suite", base = mod.class)
diff --git a/src/org/python/antlr/ast/TryExcept.java b/src/org/python/antlr/ast/TryExcept.java
--- a/src/org/python/antlr/ast/TryExcept.java
+++ b/src/org/python/antlr/ast/TryExcept.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
 import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.TryExcept", base = stmt.class)
diff --git a/src/org/python/antlr/ast/TryFinally.java b/src/org/python/antlr/ast/TryFinally.java
--- a/src/org/python/antlr/ast/TryFinally.java
+++ b/src/org/python/antlr/ast/TryFinally.java
@@ -1,14 +1,9 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.TryFinally", base = stmt.class)
diff --git a/src/org/python/antlr/ast/Tuple.java b/src/org/python/antlr/ast/Tuple.java
--- a/src/org/python/antlr/ast/Tuple.java
+++ b/src/org/python/antlr/ast/Tuple.java
@@ -1,15 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -17,14 +12,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Tuple", base = expr.class)
diff --git a/src/org/python/antlr/ast/UnaryOp.java b/src/org/python/antlr/ast/UnaryOp.java
--- a/src/org/python/antlr/ast/UnaryOp.java
+++ b/src/org/python/antlr/ast/UnaryOp.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.UnaryOp", base = expr.class)
 public class UnaryOp extends expr {
diff --git a/src/org/python/antlr/ast/VisitorBase.java b/src/org/python/antlr/ast/VisitorBase.java
--- a/src/org/python/antlr/ast/VisitorBase.java
+++ b/src/org/python/antlr/ast/VisitorBase.java
@@ -1,28 +1,7 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.Token;
-import org.python.antlr.AST;
+
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
-import org.python.core.PyString;
-import org.python.core.PyStringMap;
-import org.python.core.PyType;
-import org.python.core.Visitproc;
-import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
-import org.python.expose.ExposedType;
 
 public abstract class VisitorBase<R> implements VisitorIF<R> {
     public R visitModule(Module node) throws Exception {
diff --git a/src/org/python/antlr/ast/While.java b/src/org/python/antlr/ast/While.java
--- a/src/org/python/antlr/ast/While.java
+++ b/src/org/python/antlr/ast/While.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.While", base = stmt.class)
diff --git a/src/org/python/antlr/ast/With.java b/src/org/python/antlr/ast/With.java
--- a/src/org/python/antlr/ast/With.java
+++ b/src/org/python/antlr/ast/With.java
@@ -1,14 +1,10 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
@@ -17,14 +13,11 @@
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.With", base = stmt.class)
diff --git a/src/org/python/antlr/ast/Yield.java b/src/org/python/antlr/ast/Yield.java
--- a/src/org/python/antlr/ast/Yield.java
+++ b/src/org/python/antlr/ast/Yield.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
-import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.Yield", base = expr.class)
 public class Yield extends expr {
diff --git a/src/org/python/antlr/ast/alias.java b/src/org/python/antlr/ast/alias.java
--- a/src/org/python/antlr/ast/alias.java
+++ b/src/org/python/antlr/ast/alias.java
@@ -1,31 +1,21 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.alias", base = AST.class)
 public class alias extends PythonTree {
diff --git a/src/org/python/antlr/ast/arguments.java b/src/org/python/antlr/ast/arguments.java
--- a/src/org/python/antlr/ast/arguments.java
+++ b/src/org/python/antlr/ast/arguments.java
@@ -1,15 +1,11 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -23,8 +19,6 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.arguments", base = AST.class)
diff --git a/src/org/python/antlr/ast/boolopType.java b/src/org/python/antlr/ast/boolopType.java
--- a/src/org/python/antlr/ast/boolopType.java
+++ b/src/org/python/antlr/ast/boolopType.java
@@ -1,8 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
 
-import org.python.antlr.AST;
-
 public enum boolopType {
     UNDEFINED,
     And,
diff --git a/src/org/python/antlr/ast/cmpopType.java b/src/org/python/antlr/ast/cmpopType.java
--- a/src/org/python/antlr/ast/cmpopType.java
+++ b/src/org/python/antlr/ast/cmpopType.java
@@ -1,8 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
 
-import org.python.antlr.AST;
-
 public enum cmpopType {
     UNDEFINED,
     Eq,
diff --git a/src/org/python/antlr/ast/comprehension.java b/src/org/python/antlr/ast/comprehension.java
--- a/src/org/python/antlr/ast/comprehension.java
+++ b/src/org/python/antlr/ast/comprehension.java
@@ -1,15 +1,11 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
 import org.python.core.AstList;
 import org.python.core.Py;
@@ -23,8 +19,6 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 
 @ExposedType(name = "_ast.comprehension", base = AST.class)
diff --git a/src/org/python/antlr/ast/expr_contextType.java b/src/org/python/antlr/ast/expr_contextType.java
--- a/src/org/python/antlr/ast/expr_contextType.java
+++ b/src/org/python/antlr/ast/expr_contextType.java
@@ -1,8 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
 
-import org.python.antlr.AST;
-
 public enum expr_contextType {
     UNDEFINED,
     Load,
diff --git a/src/org/python/antlr/ast/keyword.java b/src/org/python/antlr/ast/keyword.java
--- a/src/org/python/antlr/ast/keyword.java
+++ b/src/org/python/antlr/ast/keyword.java
@@ -1,17 +1,12 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
 import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
 import org.python.core.ArgParser;
-import org.python.core.AstList;
 import org.python.core.Py;
 import org.python.core.PyObject;
 import org.python.core.PyString;
@@ -23,9 +18,6 @@
 import org.python.expose.ExposedNew;
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 
 @ExposedType(name = "_ast.keyword", base = AST.class)
 public class keyword extends PythonTree {
diff --git a/src/org/python/antlr/ast/operatorType.java b/src/org/python/antlr/ast/operatorType.java
--- a/src/org/python/antlr/ast/operatorType.java
+++ b/src/org/python/antlr/ast/operatorType.java
@@ -1,8 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
 
-import org.python.antlr.AST;
-
 public enum operatorType {
     UNDEFINED,
     Add,
diff --git a/src/org/python/antlr/ast/unaryopType.java b/src/org/python/antlr/ast/unaryopType.java
--- a/src/org/python/antlr/ast/unaryopType.java
+++ b/src/org/python/antlr/ast/unaryopType.java
@@ -1,8 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.ast;
 
-import org.python.antlr.AST;
-
 public enum unaryopType {
     UNDEFINED,
     Invert,
diff --git a/src/org/python/antlr/base/boolop.java b/src/org/python/antlr/base/boolop.java
--- a/src/org/python/antlr/base/boolop.java
+++ b/src/org/python/antlr/base/boolop.java
@@ -1,27 +1,13 @@
 // Hand copied from stmt.
 // XXX: autogenerate this.
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.boolop", base = AST.class)
diff --git a/src/org/python/antlr/base/cmpop.java b/src/org/python/antlr/base/cmpop.java
--- a/src/org/python/antlr/base/cmpop.java
+++ b/src/org/python/antlr/base/cmpop.java
@@ -1,27 +1,13 @@
 // Hand copied from stmt.
 // XXX: autogenerate this.
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.cmpop", base = AST.class)
diff --git a/src/org/python/antlr/base/excepthandler.java b/src/org/python/antlr/base/excepthandler.java
--- a/src/org/python/antlr/base/excepthandler.java
+++ b/src/org/python/antlr/base/excepthandler.java
@@ -1,27 +1,13 @@
 // Autogenerated AST node
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
 import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.excepthandler", base = AST.class)
diff --git a/src/org/python/antlr/base/expr.java b/src/org/python/antlr/base/expr.java
--- a/src/org/python/antlr/base/expr.java
+++ b/src/org/python/antlr/base/expr.java
@@ -1,27 +1,13 @@
 // Autogenerated AST node
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
 import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.expr", base = AST.class)
diff --git a/src/org/python/antlr/base/expr_context.java b/src/org/python/antlr/base/expr_context.java
--- a/src/org/python/antlr/base/expr_context.java
+++ b/src/org/python/antlr/base/expr_context.java
@@ -1,27 +1,13 @@
 // Hand copied from stmt.
 // XXX: autogenerate this.
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.expr_context", base = AST.class)
diff --git a/src/org/python/antlr/base/mod.java b/src/org/python/antlr/base/mod.java
--- a/src/org/python/antlr/base/mod.java
+++ b/src/org/python/antlr/base/mod.java
@@ -1,27 +1,13 @@
 // Autogenerated AST node
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
 import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.mod", base = AST.class)
diff --git a/src/org/python/antlr/base/operator.java b/src/org/python/antlr/base/operator.java
--- a/src/org/python/antlr/base/operator.java
+++ b/src/org/python/antlr/base/operator.java
@@ -1,27 +1,13 @@
 // Hand copied from stmt.
 // XXX: autogenerate this.
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.operator", base = AST.class)
diff --git a/src/org/python/antlr/base/slice.java b/src/org/python/antlr/base/slice.java
--- a/src/org/python/antlr/base/slice.java
+++ b/src/org/python/antlr/base/slice.java
@@ -1,27 +1,13 @@
 // Autogenerated AST node
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
 import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.slice", base = AST.class)
diff --git a/src/org/python/antlr/base/stmt.java b/src/org/python/antlr/base/stmt.java
--- a/src/org/python/antlr/base/stmt.java
+++ b/src/org/python/antlr/base/stmt.java
@@ -1,27 +1,13 @@
 // Autogenerated AST node
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
 import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
-import org.python.core.Visitproc;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.stmt", base = AST.class)
diff --git a/src/org/python/antlr/base/unaryop.java b/src/org/python/antlr/base/unaryop.java
--- a/src/org/python/antlr/base/unaryop.java
+++ b/src/org/python/antlr/base/unaryop.java
@@ -1,27 +1,13 @@
 // Hand copied from stmt.
 // XXX: autogenerate this.
 package org.python.antlr.base;
-import org.antlr.runtime.CommonToken;
+
 import org.antlr.runtime.Token;
 import org.python.antlr.AST;
 import org.python.antlr.PythonTree;
-import org.python.antlr.adapter.AstAdapters;
-import org.python.antlr.base.excepthandler;
-import org.python.antlr.base.expr;
-import org.python.antlr.base.mod;
-import org.python.antlr.base.slice;
-import org.python.antlr.base.stmt;
-import org.python.core.ArgParser;
-import org.python.core.AstList;
-import org.python.core.Py;
-import org.python.core.PyObject;
 import org.python.core.PyString;
-import org.python.core.PyStringMap;
 import org.python.core.PyType;
 import org.python.expose.ExposedGet;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.unaryop", base = AST.class)
diff --git a/src/org/python/antlr/op/Add.java b/src/org/python/antlr/op/Add.java
--- a/src/org/python/antlr/op/Add.java
+++ b/src/org/python/antlr/op/Add.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Add", base = operator.class)
diff --git a/src/org/python/antlr/op/And.java b/src/org/python/antlr/op/And.java
--- a/src/org/python/antlr/op/And.java
+++ b/src/org/python/antlr/op/And.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.boolop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.And", base = boolop.class)
diff --git a/src/org/python/antlr/op/AugLoad.java b/src/org/python/antlr/op/AugLoad.java
--- a/src/org/python/antlr/op/AugLoad.java
+++ b/src/org/python/antlr/op/AugLoad.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.AugLoad", base = expr_context.class)
diff --git a/src/org/python/antlr/op/AugStore.java b/src/org/python/antlr/op/AugStore.java
--- a/src/org/python/antlr/op/AugStore.java
+++ b/src/org/python/antlr/op/AugStore.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.AugStore", base = expr_context.class)
diff --git a/src/org/python/antlr/op/BitAnd.java b/src/org/python/antlr/op/BitAnd.java
--- a/src/org/python/antlr/op/BitAnd.java
+++ b/src/org/python/antlr/op/BitAnd.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.BitAnd", base = operator.class)
diff --git a/src/org/python/antlr/op/BitOr.java b/src/org/python/antlr/op/BitOr.java
--- a/src/org/python/antlr/op/BitOr.java
+++ b/src/org/python/antlr/op/BitOr.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.BitOr", base = operator.class)
diff --git a/src/org/python/antlr/op/BitXor.java b/src/org/python/antlr/op/BitXor.java
--- a/src/org/python/antlr/op/BitXor.java
+++ b/src/org/python/antlr/op/BitXor.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.BitXor", base = operator.class)
diff --git a/src/org/python/antlr/op/Del.java b/src/org/python/antlr/op/Del.java
--- a/src/org/python/antlr/op/Del.java
+++ b/src/org/python/antlr/op/Del.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Del", base = expr_context.class)
diff --git a/src/org/python/antlr/op/Div.java b/src/org/python/antlr/op/Div.java
--- a/src/org/python/antlr/op/Div.java
+++ b/src/org/python/antlr/op/Div.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Div", base = operator.class)
diff --git a/src/org/python/antlr/op/Eq.java b/src/org/python/antlr/op/Eq.java
--- a/src/org/python/antlr/op/Eq.java
+++ b/src/org/python/antlr/op/Eq.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Eq", base = cmpop.class)
diff --git a/src/org/python/antlr/op/FloorDiv.java b/src/org/python/antlr/op/FloorDiv.java
--- a/src/org/python/antlr/op/FloorDiv.java
+++ b/src/org/python/antlr/op/FloorDiv.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.FloorDiv", base = operator.class)
diff --git a/src/org/python/antlr/op/Gt.java b/src/org/python/antlr/op/Gt.java
--- a/src/org/python/antlr/op/Gt.java
+++ b/src/org/python/antlr/op/Gt.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Gt", base = cmpop.class)
diff --git a/src/org/python/antlr/op/GtE.java b/src/org/python/antlr/op/GtE.java
--- a/src/org/python/antlr/op/GtE.java
+++ b/src/org/python/antlr/op/GtE.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.GtE", base = cmpop.class)
diff --git a/src/org/python/antlr/op/In.java b/src/org/python/antlr/op/In.java
--- a/src/org/python/antlr/op/In.java
+++ b/src/org/python/antlr/op/In.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.In", base = cmpop.class)
diff --git a/src/org/python/antlr/op/Invert.java b/src/org/python/antlr/op/Invert.java
--- a/src/org/python/antlr/op/Invert.java
+++ b/src/org/python/antlr/op/Invert.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Invert", base = unaryop.class)
diff --git a/src/org/python/antlr/op/Is.java b/src/org/python/antlr/op/Is.java
--- a/src/org/python/antlr/op/Is.java
+++ b/src/org/python/antlr/op/Is.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Is", base = cmpop.class)
diff --git a/src/org/python/antlr/op/IsNot.java b/src/org/python/antlr/op/IsNot.java
--- a/src/org/python/antlr/op/IsNot.java
+++ b/src/org/python/antlr/op/IsNot.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.IsNot", base = cmpop.class)
diff --git a/src/org/python/antlr/op/LShift.java b/src/org/python/antlr/op/LShift.java
--- a/src/org/python/antlr/op/LShift.java
+++ b/src/org/python/antlr/op/LShift.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.LShift", base = operator.class)
diff --git a/src/org/python/antlr/op/Load.java b/src/org/python/antlr/op/Load.java
--- a/src/org/python/antlr/op/Load.java
+++ b/src/org/python/antlr/op/Load.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Load", base = expr_context.class)
diff --git a/src/org/python/antlr/op/Lt.java b/src/org/python/antlr/op/Lt.java
--- a/src/org/python/antlr/op/Lt.java
+++ b/src/org/python/antlr/op/Lt.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Lt", base = cmpop.class)
diff --git a/src/org/python/antlr/op/LtE.java b/src/org/python/antlr/op/LtE.java
--- a/src/org/python/antlr/op/LtE.java
+++ b/src/org/python/antlr/op/LtE.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.LtE", base = cmpop.class)
diff --git a/src/org/python/antlr/op/Mod.java b/src/org/python/antlr/op/Mod.java
--- a/src/org/python/antlr/op/Mod.java
+++ b/src/org/python/antlr/op/Mod.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Mod", base = operator.class)
diff --git a/src/org/python/antlr/op/Mult.java b/src/org/python/antlr/op/Mult.java
--- a/src/org/python/antlr/op/Mult.java
+++ b/src/org/python/antlr/op/Mult.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Mult", base = operator.class)
diff --git a/src/org/python/antlr/op/Not.java b/src/org/python/antlr/op/Not.java
--- a/src/org/python/antlr/op/Not.java
+++ b/src/org/python/antlr/op/Not.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Not", base = unaryop.class)
diff --git a/src/org/python/antlr/op/NotEq.java b/src/org/python/antlr/op/NotEq.java
--- a/src/org/python/antlr/op/NotEq.java
+++ b/src/org/python/antlr/op/NotEq.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.NotEq", base = cmpop.class)
diff --git a/src/org/python/antlr/op/NotIn.java b/src/org/python/antlr/op/NotIn.java
--- a/src/org/python/antlr/op/NotIn.java
+++ b/src/org/python/antlr/op/NotIn.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.NotIn", base = cmpop.class)
diff --git a/src/org/python/antlr/op/Or.java b/src/org/python/antlr/op/Or.java
--- a/src/org/python/antlr/op/Or.java
+++ b/src/org/python/antlr/op/Or.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.boolop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Or", base = boolop.class)
diff --git a/src/org/python/antlr/op/Param.java b/src/org/python/antlr/op/Param.java
--- a/src/org/python/antlr/op/Param.java
+++ b/src/org/python/antlr/op/Param.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Param", base = expr_context.class)
diff --git a/src/org/python/antlr/op/Pow.java b/src/org/python/antlr/op/Pow.java
--- a/src/org/python/antlr/op/Pow.java
+++ b/src/org/python/antlr/op/Pow.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Pow", base = operator.class)
diff --git a/src/org/python/antlr/op/RShift.java b/src/org/python/antlr/op/RShift.java
--- a/src/org/python/antlr/op/RShift.java
+++ b/src/org/python/antlr/op/RShift.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.RShift", base = operator.class)
diff --git a/src/org/python/antlr/op/Store.java b/src/org/python/antlr/op/Store.java
--- a/src/org/python/antlr/op/Store.java
+++ b/src/org/python/antlr/op/Store.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Store", base = expr_context.class)
diff --git a/src/org/python/antlr/op/Sub.java b/src/org/python/antlr/op/Sub.java
--- a/src/org/python/antlr/op/Sub.java
+++ b/src/org/python/antlr/op/Sub.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.Sub", base = operator.class)
diff --git a/src/org/python/antlr/op/UAdd.java b/src/org/python/antlr/op/UAdd.java
--- a/src/org/python/antlr/op/UAdd.java
+++ b/src/org/python/antlr/op/UAdd.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.UAdd", base = unaryop.class)
diff --git a/src/org/python/antlr/op/USub.java b/src/org/python/antlr/op/USub.java
--- a/src/org/python/antlr/op/USub.java
+++ b/src/org/python/antlr/op/USub.java
@@ -1,7 +1,6 @@
 // Autogenerated AST node
 package org.python.antlr.op;
 
-import org.python.antlr.AST;
 import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
@@ -11,7 +10,6 @@
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
-import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
 @ExposedType(name = "_ast.USub", base = unaryop.class)

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

From jython-checkins at python.org  Mon Jan  9 10:05:31 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 15:05:31 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Removed_accidentially_inser?=
 =?utf-8?q?ted_tab=2E?=
Message-ID: <20170109150527.16326.96393.D6E5BF1D@psf.io>

https://hg.python.org/jython/rev/34fc320fc68f
changeset:   7997:34fc320fc68f
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 16:05:21 2017 +0100
summary:
  Removed accidentially inserted tab.

files:
  src/org/python/antlr/adapter/AstAdapters.java |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/src/org/python/antlr/adapter/AstAdapters.java b/src/org/python/antlr/adapter/AstAdapters.java
--- a/src/org/python/antlr/adapter/AstAdapters.java
+++ b/src/org/python/antlr/adapter/AstAdapters.java
@@ -20,7 +20,7 @@
     public final static SliceAdapter sliceAdapter = new SliceAdapter();
     public final static StmtAdapter stmtAdapter = new StmtAdapter();
 
-	public static java.util.List<alias> py2aliasList(PyObject o) {
+    public static java.util.List<alias> py2aliasList(PyObject o) {
         return (java.util.List<alias>)aliasAdapter.iter2ast(o);
     }
 

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

From jython-checkins at python.org  Mon Jan  9 12:00:25 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 17:00:25 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Added_=5F=5Finstancecheck?=
 =?utf-8?q?=5F=5F_and_=5F=5Fsubclasscheck=5F=5F_methods_to_type=2C_like_th?=
 =?utf-8?q?ey_are_in?=
Message-ID: <20170109170020.20040.56578.C80C49C9@psf.io>

https://hg.python.org/jython/rev/0c4573848c75
changeset:   7998:0c4573848c75
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 18:00:10 2017 +0100
summary:
  Added __instancecheck__ and __subclasscheck__ methods to type, like they are in CPython 2.7.

files:
  src/org/python/core/PyType.java |  17 +++++++++++++++++
  1 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/src/org/python/core/PyType.java b/src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java
+++ b/src/org/python/core/PyType.java
@@ -928,6 +928,23 @@
         return result;
     }
 
+    @ExposedMethod(doc = BuiltinDocs.type___subclasscheck___doc)
+    public synchronized final boolean type___subclasscheck__(PyObject inst) {
+        return Py.isSubClass(inst, this);
+    }
+
+    @ExposedMethod(doc = BuiltinDocs.type___instancecheck___doc)
+    public synchronized final boolean type___instancecheck__(PyObject inst) {
+        /* We cannot directly call Py.isInstance(inst, this), because that
+         * would yield endless recursion. So we inline the essential parts
+         * from there, excluding checker-delegation and PyTuple special case.
+         */
+        if (inst.getType() == this) {
+            return true;
+        }
+        return Py.recursiveIsInstance(inst, this);
+    }
+
     /**
      * Returns the Java Class that this type inherits from, or null if this type is Python-only.
      */

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

From jython-checkins at python.org  Mon Jan  9 12:45:20 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 17:45:20 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Improved_=5F=5Fsubclasschec?=
 =?utf-8?q?k=5F=5F_in_PyType_such_that_it_doesn=27t_break?=
Message-ID: <20170109174519.27690.74531.6AEB5D53@psf.io>

https://hg.python.org/jython/rev/84459b5a40e1
changeset:   7999:84459b5a40e1
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 18:45:11 2017 +0100
summary:
  Improved __subclasscheck__ in PyType such that it doesn't break test_collections any more (by endless recursion).

files:
  src/org/python/core/PyType.java |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/src/org/python/core/PyType.java b/src/org/python/core/PyType.java
--- a/src/org/python/core/PyType.java
+++ b/src/org/python/core/PyType.java
@@ -930,7 +930,11 @@
 
     @ExposedMethod(doc = BuiltinDocs.type___subclasscheck___doc)
     public synchronized final boolean type___subclasscheck__(PyObject inst) {
-        return Py.isSubClass(inst, this);
+        /* We cannot directly call Py.isSubClass(inst, this), because that
+         * would yield endless recursion under some circumstances (e.g. in
+         * test_collections).
+         */
+        return Py.recursiveIsSubClass(inst, this);
     }
 
     @ExposedMethod(doc = BuiltinDocs.type___instancecheck___doc)

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

From jython-checkins at python.org  Mon Jan  9 13:09:51 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 18:09:51 +0000
Subject: [Jython-checkins] =?utf-8?b?anl0aG9uOiBFeHBvc2VkIF9fbmFtZV9fIGF0?=
 =?utf-8?q?tribute_of_generator_objects=2E_Todo=3A_Tune?=
Message-ID: <20170109180951.93530.65823.1F9C7D40@psf.io>

https://hg.python.org/jython/rev/b4e371b4f505
changeset:   8000:b4e371b4f505
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 19:09:44 2017 +0100
summary:
  Exposed __name__ attribute of generator objects. Todo: Tune PyGenerator.toString to match CPython's version.

files:
  src/org/python/core/PyGenerator.java |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/src/org/python/core/PyGenerator.java b/src/org/python/core/PyGenerator.java
--- a/src/org/python/core/PyGenerator.java
+++ b/src/org/python/core/PyGenerator.java
@@ -33,6 +33,11 @@
         FinalizeTrigger.ensureFinalizer(this);
     }
 
+    @ExposedGet(name = "__name__")
+    public String getName() {
+        return gi_code.co_name;
+    }
+
     public PyObject send(PyObject value) {
         return generator_send(value);
     }

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

From jython-checkins at python.org  Mon Jan  9 17:31:32 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Mon, 09 Jan 2017 22:31:32 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Adjusted_PyGenerator_such_t?=
 =?utf-8?q?hat_str=28generator=5Fobject=29_behaves_like_in_CPython=2E?=
Message-ID: <20170109223132.26224.24389.C301A93B@psf.io>

https://hg.python.org/jython/rev/088c63ec3233
changeset:   8001:088c63ec3233
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Mon Jan 09 23:31:07 2017 +0100
summary:
  Adjusted PyGenerator such that str(generator_object) behaves like in CPython. Same for repr.

files:
  Lib/test/test_genexps.py             |   2 +-
  src/org/python/core/PyGenerator.java |  10 ++++++++++
  2 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_genexps.py b/Lib/test/test_genexps.py
--- a/Lib/test/test_genexps.py
+++ b/Lib/test/test_genexps.py
@@ -98,7 +98,7 @@
 Verify that parenthesis are required when used as a keyword argument value
 
     >>> dict(a = (i for i in xrange(10))) #doctest: +ELLIPSIS
-    {'a': <generator object at ...>}
+    {'a': <generator object <genexpr> at ...>}
 
 Verify early binding for the outermost for-expression
 
diff --git a/src/org/python/core/PyGenerator.java b/src/org/python/core/PyGenerator.java
--- a/src/org/python/core/PyGenerator.java
+++ b/src/org/python/core/PyGenerator.java
@@ -177,6 +177,16 @@
         return result;
     }
 
+    @Override
+    public String toString() {
+        return generator_toString();
+    }
+
+    @ExposedMethod(names = "__repr__")
+    final String generator_toString() {
+        return String.format("<generator object %s at %s>", getName(), Py.idstr(this));
+    }
+
 
     /* Traverseproc implementation */
     @Override

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

From jython-checkins at python.org  Tue Jan 10 13:01:22 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Tue, 10 Jan 2017 18:01:22 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Fixed_metaclass-issue_in_Py?=
 =?utf-8?q?=2EdispatchToChecker=2E_There_are_circumstances_under?=
Message-ID: <20170110180120.990.57517.07C2D1D5@psf.io>

https://hg.python.org/jython/rev/ffc2bad8ec9e
changeset:   8002:ffc2bad8ec9e
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Tue Jan 10 19:00:01 2017 +0100
summary:
  Fixed metaclass-issue in Py.dispatchToChecker. There are circumstances under which a metaclass does not show up as __metaclass__.

files:
  src/org/python/core/Py.java |  17 +++++++++++------
  1 files changed, 11 insertions(+), 6 deletions(-)


diff --git a/src/org/python/core/Py.java b/src/org/python/core/Py.java
--- a/src/org/python/core/Py.java
+++ b/src/org/python/core/Py.java
@@ -2264,12 +2264,17 @@
         if (cls instanceof PyClass) {
             return null;
         }
-        PyObject meta = cls.__findattr__("__metaclass__");
-        if (meta == null) {
-            return null;
-        }
-        PyObject checker = meta.__findattr__(checkerName);
-        if (checker == null) {
+        /* Here we would actually like to call cls.__findattr__("__metaclass__")
+         * rather than cls.getType(). However there are circumstances where the
+         * metaclass doesn't show up as __metaclass__. On the other hand we need 
+         * to avoid that checker refers to builtin type___subclasscheck__ or
+         * type___instancecheck__. Filtering out checker-instances of
+         * PyBuiltinMethodNarrow does the trick. We also filter out PyMethodDescr
+         * to shortcut some unnecessary looping.
+         */
+        PyObject checker = cls.getType().__findattr__(checkerName);
+        if (checker == null || checker instanceof PyMethodDescr ||
+                checker instanceof PyBuiltinMethodNarrow) {
             return null;
         }
         return checker.__call__(cls, checkerArg);

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

From jython-checkins at python.org  Wed Jan 11 17:56:21 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Wed, 11 Jan 2017 22:56:21 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Let_PyString_implement_java?=
 =?utf-8?q?=2Elang=2ECharSequence_for_better_Java-integration=2E?=
Message-ID: <20170111225620.16815.85518.6A173F51@psf.io>

https://hg.python.org/jython/rev/55b8dc79e90c
changeset:   8003:55b8dc79e90c
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Wed Jan 11 23:55:15 2017 +0100
summary:
  Let PyString implement java.lang.CharSequence for better Java-integration.

files:
  src/org/python/core/PyBaseString.java |  17 ++++++++++++++-
  src/org/python/core/PyString.java     |  15 +++++++++++++
  2 files changed, 31 insertions(+), 1 deletions(-)


diff --git a/src/org/python/core/PyBaseString.java b/src/org/python/core/PyBaseString.java
--- a/src/org/python/core/PyBaseString.java
+++ b/src/org/python/core/PyBaseString.java
@@ -6,11 +6,26 @@
  * base class for jython strings.
  */
 @ExposedType(name = "basestring", base = PyObject.class, doc = BuiltinDocs.basestring_doc)
-public abstract class PyBaseString extends PySequence {
+public abstract class PyBaseString extends PySequence implements CharSequence {
     
     public static final PyType TYPE = PyType.fromClass(PyBaseString.class);
 
     protected PyBaseString(PyType type) {
         super(type);
     }
+
+    @Override
+    public char charAt(int index) {
+        return toString().charAt(index);
+    }
+
+    @Override
+    public int length() {
+        return toString().length();
+    }
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return toString().subSequence(start, end);
+    }
 }
diff --git a/src/org/python/core/PyString.java b/src/org/python/core/PyString.java
--- a/src/org/python/core/PyString.java
+++ b/src/org/python/core/PyString.java
@@ -4253,6 +4253,21 @@
         }
         return super.unsupportedopMessage(op, o2);
     }
+
+    @Override
+    public char charAt(int index) {
+        return string.charAt(index);
+    }
+
+    @Override
+    public int length() {
+        return string.length();
+    }
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return string.subSequence(start, end);
+    }
 }
 
 

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

From jython-checkins at python.org  Wed Jan 11 18:14:53 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Wed, 11 Jan 2017 23:14:53 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Filled_in_some_generic_type?=
 =?utf-8?q?-info_in_PyUnicode_and_PyList=2E?=
Message-ID: <20170111231453.102786.37287.8FEFCA23@psf.io>

https://hg.python.org/jython/rev/a463c085baf4
changeset:   8004:a463c085baf4
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Thu Jan 12 00:14:45 2017 +0100
summary:
  Filled in some generic type-info in PyUnicode and PyList.

files:
  src/org/python/core/PyList.java    |  34 ++++++++++-------
  src/org/python/core/PyUnicode.java |  30 +++++++-------
  2 files changed, 34 insertions(+), 30 deletions(-)


diff --git a/src/org/python/core/PyList.java b/src/org/python/core/PyList.java
--- a/src/org/python/core/PyList.java
+++ b/src/org/python/core/PyList.java
@@ -106,7 +106,7 @@
     // refactor and put in Py presumably;
     // presumably we can consume an arbitrary iterable too!
     private static void addCollection(List<PyObject> list, Collection<Object> seq) {
-        Map<Long, PyObject> seen = new HashMap();
+        Map<Long, PyObject> seen = new HashMap<>();
         for (Object item : seq) {
             long id = Py.java_obj_id(item);
             PyObject seen_obj = seen.get(id);
@@ -118,6 +118,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     @ExposedNew
     @ExposedMethod(doc = BuiltinDocs.list___init___doc)
     final void list___init__(PyObject[] args, String[] kwds) {
@@ -141,7 +142,7 @@
             list.addAll(((PyTuple) seq).getList());
         } else if (seq.getClass().isAssignableFrom(Collection.class)) {
             System.err.println("Adding from collection");
-            addCollection(list, (Collection)seq);
+            addCollection(list, (Collection<Object>) seq);
         } else {
             for (PyObject item : seq.asIterable()) {
                 append(item);
@@ -169,6 +170,7 @@
         remove(start, stop);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected void setslice(int start, int stop, int step, PyObject value) {
         if (stop < start) {
@@ -182,11 +184,11 @@
         } else if (value instanceof PySequence) {
             setsliceIterator(start, stop, step, value.asIterable().iterator());
         } else if (value instanceof List) {
-                setsliceList(start, stop, step, (List)value);
+                setsliceList(start, stop, step, (List<Object>)value);
         } else {
             Object valueList = value.__tojava__(List.class);
             if (valueList != null && valueList != Py.NoConversion) {
-                setsliceList(start, stop, step, (List)valueList);
+                setsliceList(start, stop, step, (List<Object>)valueList);
             } else {
                 value = new PyList(value);
                 setsliceIterator(start, stop, step, value.asIterable().iterator());
@@ -194,7 +196,7 @@
         }
     }
 
-    final private void setsliceList(int start, int stop, int step, List value) {
+    final private void setsliceList(int start, int stop, int step, List<Object> value) {
         if (step == 1) {
             list.subList(start, stop).clear();
             int n = value.size();
@@ -333,7 +335,7 @@
 
         int newSize = size * count;
         if (list instanceof ArrayList) {
-            ((ArrayList) list).ensureCapacity(newSize);
+            ((ArrayList<PyObject>) list).ensureCapacity(newSize);
         }
         List<PyObject> oldList = new ArrayList<PyObject>(list);
         for (int i = 1; i < count; i++) {
@@ -379,8 +381,8 @@
         PyList sum = null;
         if (o instanceof PySequenceList && !(o instanceof PyTuple)) {
             if (o instanceof PyList) {
-                List oList = ((PyList) o).list;
-                List newList = new ArrayList(list.size() + oList.size());
+                List<PyObject> oList = ((PyList) o).list;
+                ArrayList<PyObject> newList = new ArrayList<>(list.size() + oList.size());
                 newList.addAll(list);
                 newList.addAll(oList);
                 sum = fromList(newList);
@@ -389,11 +391,12 @@
             // also support adding java lists (but not PyTuple!)
             Object oList = o.__tojava__(List.class);
             if (oList != Py.NoConversion && oList != null) {
-                List otherList = (List) oList;
+                @SuppressWarnings("unchecked")
+                List<PyObject> otherList = (List<PyObject>) oList;
                 sum = new PyList();
                 sum.list_extend(this);
-                for (Iterator i = otherList.iterator(); i.hasNext();) {
-                    sum.add(i.next());
+                for (PyObject ob: otherList) {
+                    sum.add(ob);
                 }
             }
         }
@@ -406,6 +409,7 @@
     }
 
     //XXX: needs __doc__
+    @SuppressWarnings("unchecked")
     @ExposedMethod(type = MethodType.BINARY)
     final synchronized PyObject list___radd__(PyObject o) {
         // Support adding java.util.List, but prevent adding PyTuple.
@@ -417,7 +421,7 @@
         Object oList = o.__tojava__(List.class);
         if (oList != Py.NoConversion && oList != null) {
             sum = new PyList();
-            sum.addAll((List) oList);
+            sum.addAll((List<PyObject>) oList);
             sum.extend(this);
         }
         return sum;
@@ -958,7 +962,7 @@
             Collections.reverse(decorated);
         }
         if (list instanceof ArrayList) {
-            ((ArrayList) list).ensureCapacity(size);
+            ((ArrayList<PyObject>) list).ensureCapacity(size);
         }
         for (KV kv : decorated) {
             list.add(kv.value);
@@ -1063,8 +1067,8 @@
     }
 
     @Override
-    public Iterator iterator() {
-        return new Iterator() {
+    public Iterator<Object> iterator() {
+        return new Iterator<Object>() {
 
             private final Iterator<PyObject> iter = list.iterator();
 
diff --git a/src/org/python/core/PyUnicode.java b/src/org/python/core/PyUnicode.java
--- a/src/org/python/core/PyUnicode.java
+++ b/src/org/python/core/PyUnicode.java
@@ -24,7 +24,7 @@
  */
 @Untraversable
 @ExposedType(name = "unicode", base = PyBaseString.class, doc = BuiltinDocs.unicode_doc)
-public class PyUnicode extends PyString implements Iterable {
+public class PyUnicode extends PyString implements Iterable<Integer> {
 
     /**
      * Nearly every significant method comes in two versions: one applicable when the string
@@ -822,7 +822,7 @@
         }
     }
 
-    private static class SteppedIterator<T> implements Iterator {
+    private static class SteppedIterator<T> implements Iterator<T> {
 
         private final Iterator<T> iter;
         private final int step;
@@ -885,14 +885,14 @@
     public Iterator<Integer> newSubsequenceIterator(int start, int stop, int step) {
         if (isBasicPlane()) {
             if (step < 0) {
-                return new SteppedIterator(step * -1, new ReversedIterator(
+                return new SteppedIterator<Integer>(step * -1, new ReversedIterator<Integer>(
                         new SubsequenceIteratorBasic(stop + 1, start + 1, 1)));
             } else {
                 return new SubsequenceIteratorBasic(start, stop, step);
             }
         } else {
             if (step < 0) {
-                return new SteppedIterator(step * -1, new ReversedIterator(
+                return new SteppedIterator<Integer>(step * -1, new ReversedIterator<Integer>(
                         new SubsequenceIteratorImpl(stop + 1, start + 1, 1)));
             } else {
                 return new SubsequenceIteratorImpl(start, stop, step);
@@ -1026,7 +1026,7 @@
         return new PyUnicode(buffer);
     }
 
-    private static class StripIterator implements Iterator {
+    private static class StripIterator implements Iterator<Integer> {
 
         private final Iterator<Integer> iter;
         private int lookahead = -1;
@@ -1062,7 +1062,7 @@
         }
 
         @Override
-        public Object next() {
+        public Integer next() {
             int old = lookahead;
             if (iter.hasNext()) {
                 lookahead = iter.next();
@@ -1121,7 +1121,7 @@
         }
 
         // Not basic plane: have to do real Unicode
-        return new PyUnicode(new ReversedIterator(new StripIterator(sep, new ReversedIterator(
+        return new PyUnicode(new ReversedIterator<Integer>(new StripIterator(sep, new ReversedIterator<>(
                 new StripIterator(sep, newSubsequenceIterator())))));
     }
 
@@ -1162,8 +1162,8 @@
         }
 
         // Not basic plane: have to do real Unicode
-        return new PyUnicode(new ReversedIterator(new StripIterator(sep, new ReversedIterator(
-                newSubsequenceIterator()))));
+        return new PyUnicode(new ReversedIterator<Integer>(new StripIterator(sep,
+                new ReversedIterator<>(newSubsequenceIterator()))));
     }
 
     @Override
@@ -1176,7 +1176,7 @@
         return unicodePartition(coerceToUnicode(sep));
     }
 
-    private abstract class SplitIterator implements Iterator {
+    private abstract class SplitIterator implements Iterator<PyUnicode> {
 
         protected final int maxsplit;
         protected final Iterator<Integer> iter = newSubsequenceIterator();
@@ -1254,7 +1254,7 @@
         }
     }
 
-    private static class PeekIterator<T> implements Iterator {
+    private static class PeekIterator<T> implements Iterator<T> {
 
         private T lookahead = null;
         private final Iterator<T> iter;
@@ -1286,7 +1286,7 @@
         }
     }
 
-    private static class ReversedIterator<T> implements Iterator {
+    private static class ReversedIterator<T> implements Iterator<T> {
 
         private final List<T> reversed = Generic.list();
         private final Iterator<T> iter;
@@ -1315,9 +1315,9 @@
         }
     }
 
-    private class LineSplitIterator implements Iterator {
+    private class LineSplitIterator implements Iterator<PyObject> {
 
-        private final PeekIterator<Integer> iter = new PeekIterator(newSubsequenceIterator());
+        private final PeekIterator<Integer> iter = new PeekIterator<>(newSubsequenceIterator());
         private final boolean keepends;
 
         LineSplitIterator(boolean keepends) {
@@ -1330,7 +1330,7 @@
         }
 
         @Override
-        public Object next() {
+        public PyObject next() {
             StringBuilder buffer = new StringBuilder();
             while (iter.hasNext()) {
                 int codepoint = iter.next();

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

From jython-checkins at python.org  Thu Jan 12 08:08:43 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Thu, 12 Jan 2017 13:08:43 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Merged_PR_=2348_github=2Eco?=
 =?utf-8?q?m/jythontools/jython/pull/48=2C_which_fixes_issue_=232522?=
Message-ID: <20170112130839.103156.48486.B030FAA9@psf.io>

https://hg.python.org/jython/rev/cafb76765c27
changeset:   8005:cafb76765c27
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Thu Jan 12 14:08:15 2017 +0100
summary:
  Merged PR #48 github.com/jythontools/jython/pull/48, which fixes issue #2522 defaultdict.__getitem__(unhashable) raises KeyError instead of TypeError.

files:
  Lib/test/test_defaultdict_jy.py                        |  18 ++++++++-
  NEWS                                                   |   1 +
  src/org/python/modules/_collections/PyDefaultDict.java |  14 +++++--
  3 files changed, 25 insertions(+), 8 deletions(-)


diff --git a/Lib/test/test_defaultdict_jy.py b/Lib/test/test_defaultdict_jy.py
--- a/Lib/test/test_defaultdict_jy.py
+++ b/Lib/test/test_defaultdict_jy.py
@@ -99,6 +99,16 @@
         for i in xrange(size):
             self.assertEqual(counters[i].get(), i, counters)
 
+
+class UnhashableKeyRaiseTypeErrorTestCase(unittest.TestCase):
+
+    def test_setitem_raises_typeerror(self):
+        self.assertRaises(TypeError, defaultdict(int).__setitem__, {}, 1)
+
+    def test_getitem_raises_typeerror(self):
+        self.assertRaises(TypeError, defaultdict(int).__getitem__, {})
+
+
 class GetVariantsTestCase(unittest.TestCase):
 
     #http://bugs.jython.org/issue2133
@@ -119,7 +129,6 @@
         self.assertEquals(d.items(), [("vivify", [])]) 
 
 
-
 class OverrideMissingTestCase(unittest.TestCase):
     class KeyDefaultDict(defaultdict):
         """defaultdict to pass the requested key to factory function."""
@@ -137,7 +146,8 @@
             return k + k
 
     def setUp(self):
-        self.kdd = OverrideMissingTestCase.KeyDefaultDict(OverrideMissingTestCase.KeyDefaultDict.double)
+        self.kdd = OverrideMissingTestCase.KeyDefaultDict(
+                OverrideMissingTestCase.KeyDefaultDict.double)
 
     def test_dont_call_derived_missing(self):
         self.kdd[3] = 5
@@ -151,7 +161,9 @@
 
 
 def test_main():
-    test_support.run_unittest(PickleTestCase, ThreadSafetyTestCase, GetVariantsTestCase, OverrideMissingTestCase)
+    test_support.run_unittest(PickleTestCase, ThreadSafetyTestCase,
+            UnhashableKeyRaiseTypeErrorTestCase,
+            GetVariantsTestCase, OverrideMissingTestCase)
 
 
 if __name__ == '__main__':
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2522 ] defaultdict.__getitem__(unhashable) raises KeyError instead of TypeError
     - [ 2515 ] typing module doesn't import
     - [ 2538 ] Test failures in test_unittest
     - [ 2293 ] "java.lang.IllegalArgumentException: java.lang.IllegalArgumentException:
diff --git a/src/org/python/modules/_collections/PyDefaultDict.java b/src/org/python/modules/_collections/PyDefaultDict.java
--- a/src/org/python/modules/_collections/PyDefaultDict.java
+++ b/src/org/python/modules/_collections/PyDefaultDict.java
@@ -7,8 +7,10 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import org.python.core.BuiltinDocs;
 import org.python.core.Py;
 import org.python.core.PyDictionary;
+import org.python.core.PyException;
 import org.python.core.PyObject;
 import org.python.core.PyTuple;
 import org.python.core.PyType;
@@ -21,11 +23,6 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.ComputationException;
-import com.google.common.base.Function;
-import org.python.core.BuiltinDocs;
-
 /**
  * PyDefaultDict - This is a subclass of the builtin dict(PyDictionary) class. It supports
  * one additional method __missing__ and adds one writable instance variable
@@ -165,6 +162,13 @@
     protected final PyObject defaultdict___getitem__(PyObject key) {
         try {
             return backingMap.get(key);
+        } catch (PyException pe) {
+            /* LoadingCache#get() don't throw any PyException itself and it
+             * prevents those raised in CacheLoader#load() to get through
+             * without being wrapped in UncheckedExecutionException, so this
+             * PyException must be from key#hashCode(). We can propagated it to
+             * caller as it is. */
+            throw pe;
         } catch (Exception ex) {
             throw Py.KeyError(key);
         }

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

From jython-checkins at python.org  Thu Jan 12 08:49:42 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Thu, 12 Jan 2017 13:49:42 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Merged_PR_=2349_github=2Eco?=
 =?utf-8?q?m/jythontools/jython/pull/49=2C_which_fixes_issue_=232523?=
Message-ID: <20170112134942.26442.80329.9DDCE4C2@psf.io>

https://hg.python.org/jython/rev/509d0ba0a3e4
changeset:   8006:509d0ba0a3e4
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Thu Jan 12 14:49:34 2017 +0100
summary:
  Merged PR #49 github.com/jythontools/jython/pull/49, which fixes issue #2523 defaultdict.__getitem__() does not propagate exceptions raised by calling default_factory

files:
  Lib/test/test_defaultdict_jy.py                        |  35 +++++++++-
  NEWS                                                   |   2 +
  src/org/python/modules/_collections/PyDefaultDict.java |  18 ++++-
  3 files changed, 51 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_defaultdict_jy.py b/Lib/test/test_defaultdict_jy.py
--- a/Lib/test/test_defaultdict_jy.py
+++ b/Lib/test/test_defaultdict_jy.py
@@ -101,6 +101,7 @@
 
 
 class UnhashableKeyRaiseTypeErrorTestCase(unittest.TestCase):
+    # http://bugs.jython.org/issue2522
 
     def test_setitem_raises_typeerror(self):
         self.assertRaises(TypeError, defaultdict(int).__setitem__, {}, 1)
@@ -110,8 +111,7 @@
 
 
 class GetVariantsTestCase(unittest.TestCase):
-
-    #http://bugs.jython.org/issue2133
+    # http://bugs.jython.org/issue2133
 
     def test_get_does_not_vivify(self):
         d = defaultdict(list)
@@ -129,6 +129,34 @@
         self.assertEquals(d.items(), [("vivify", [])]) 
 
 
+class GetItemPropagateWhateverMissingRaisedTestCase(unittest.TestCase):
+    # http://bugs.jython.org/issue2523
+
+    def test_getitem_propagate_default_factory_raises(self):
+
+        class FooError(Exception):
+            pass
+
+        def defaultfactory():
+            raise FooError()
+
+        d = defaultdict(defaultfactory)
+        self.assertRaises(FooError, d.__getitem__, 'bar')
+
+    def test_getitem_propagate_overridden_missing_raises(self):
+
+        class FooError(Exception):
+            pass
+
+        class DefaultDict(defaultdict):
+
+            def __missing__(self, key):
+                raise FooError()
+
+        d = DefaultDict(int)
+        self.assertRaises(FooError, d.__getitem__, 'bar')
+
+
 class OverrideMissingTestCase(unittest.TestCase):
     class KeyDefaultDict(defaultdict):
         """defaultdict to pass the requested key to factory function."""
@@ -163,7 +191,8 @@
 def test_main():
     test_support.run_unittest(PickleTestCase, ThreadSafetyTestCase,
             UnhashableKeyRaiseTypeErrorTestCase,
-            GetVariantsTestCase, OverrideMissingTestCase)
+            GetVariantsTestCase, OverrideMissingTestCase,
+            GetItemPropagateWhateverMissingRaisedTestCase)
 
 
 if __name__ == '__main__':
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2523 ] defaultdict.__getitem__() does not propagate exceptions raised by calling
+               default_factory
     - [ 2522 ] defaultdict.__getitem__(unhashable) raises KeyError instead of TypeError
     - [ 2515 ] typing module doesn't import
     - [ 2538 ] Test failures in test_unittest
diff --git a/src/org/python/modules/_collections/PyDefaultDict.java b/src/org/python/modules/_collections/PyDefaultDict.java
--- a/src/org/python/modules/_collections/PyDefaultDict.java
+++ b/src/org/python/modules/_collections/PyDefaultDict.java
@@ -57,7 +57,11 @@
         backingMap = CacheBuilder.newBuilder().build(
                 new CacheLoader<PyObject, PyObject>() {
                     public PyObject load(PyObject key) {
-                        return __missing__(key);
+                        try {
+                            return __missing__(key);
+                        } catch (RuntimeException ex) {
+                            throw new MissingThrownException(ex);
+                        }
                     }
                 });
     }
@@ -170,6 +174,10 @@
              * caller as it is. */
             throw pe;
         } catch (Exception ex) {
+            Throwable cause = ex.getCause();
+            if (cause != null && cause instanceof MissingThrownException) {
+                throw ((MissingThrownException) cause).thrownByMissing;
+            }
             throw Py.KeyError(key);
         }
     }
@@ -224,4 +232,12 @@
         }
         return backingMap.asMap().containsKey(ob) || backingMap.asMap().containsValue(ob);
     }
+
+    private static class MissingThrownException extends RuntimeException {
+        final RuntimeException thrownByMissing;
+        MissingThrownException(RuntimeException thrownByMissing) {
+            super(thrownByMissing);
+            this.thrownByMissing = thrownByMissing;
+        }
+    }
 }

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

From jython-checkins at python.org  Thu Jan 12 10:20:36 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Thu, 12 Jan 2017 15:20:36 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Fixes_issue_=23608632_by_le?=
 =?utf-8?q?tting_=5F=5Fdoc=5F=5FmemberName_accept_anything_that?=
Message-ID: <20170112152035.50588.67942.3801301E@psf.io>

https://hg.python.org/jython/rev/fcfff8fb886d
changeset:   8007:fcfff8fb886d
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Thu Jan 12 16:19:40 2017 +0100
summary:
  Fixes issue #608632 by letting __doc__memberName accept anything that implements java.lang.CharSequence. This is a modified merge of #41 github.com/jythontools/jython/pull/41, just extended to accept any CharSequence, e.g. String, Stringbuffer, StringBuilder. Originally I recognized CharSequence as an elegant way to unify String and PyString and as of github.com/jythontools/jython/commit/5822a827cfcca9a0af4c427cd672a32d968ee8f4 PyBaseString and thus also PyString and PyUnicode implement CharSequence too. Using CharSequence seems like the ideal compromise between allowing any Java-Object and allowing only String and PyString.

files:
  NEWS                                |   4 ++
  src/org/python/core/PyJavaType.java |  30 ++++++++++------
  2 files changed, 22 insertions(+), 12 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 608632 ] __doc__foo should accept java String
     - [ 2523 ] defaultdict.__getitem__() does not propagate exceptions raised by calling
                default_factory
     - [ 2522 ] defaultdict.__getitem__(unhashable) raises KeyError instead of TypeError
@@ -46,6 +47,9 @@
     - [ 1767 ] Rich comparisons
 
   New Features
+    - Jython doc-entries in Java-code (__doc__foo) now accept anything that implements
+      java.lang.CharSequence (PyString implements CharSequence now as well).
+      This allows Jython-friendly Java-code without PyString-induced dependency on Jython.
     - Provided a painless way to deal with long-standing Issue 527524 - "Cannot compile to use
       methods exceeding JVM size restrictions": If a CPython 2.7 bytecode-file (.pyc) exists,
       Jython automatically uses that bytecode to represent oversized functions and methods,
diff --git a/src/org/python/core/PyJavaType.java b/src/org/python/core/PyJavaType.java
--- a/src/org/python/core/PyJavaType.java
+++ b/src/org/python/core/PyJavaType.java
@@ -178,7 +178,7 @@
             for (String method : type.modified) {
                 if (!allModified.add(method)) { // Another type in conflict has this method, possibly fail
                     PyList types = new PyList();
-                    Set<Class> proxySet = Generic.set();
+                    Set<Class<?>> proxySet = Generic.set();
                     for (PyJavaType othertype : conflictedAttributes) {
                         if (othertype.modified != null && othertype.modified.contains(method)) {
                             types.add(othertype);
@@ -283,7 +283,7 @@
 
         // Add methods and determine bean properties declared on this class
         Map<String, PyBeanProperty> props = Generic.map();
-        Map<String, PyBeanEvent> events = Generic.map();
+        Map<String, PyBeanEvent<?>> events = Generic.map();
         Method[] methods;
         if (Options.respectJavaAccessibility) {
             // returns just the public methods
@@ -344,7 +344,7 @@
                     ename = ename.substring(idot + 1);
                 }
                 ename = normalize(StringUtil.decapitalize(ename));
-                events.put(ename, new PyBeanEvent(ename, eventClass, meth));
+                events.put(ename, new PyBeanEvent<>(ename, eventClass, meth));
                 continue;
             }
 
@@ -378,7 +378,7 @@
                     // XXX: should we issue a warning if setX and getX have different
                     // types?
                     if (prop.myType == null) {
-                        Class[] params = meth.getParameterTypes();
+                        Class<?>[] params = meth.getParameterTypes();
                         if (params.length == 1) {
                             prop.myType = params[0];
                         }
@@ -423,17 +423,18 @@
             String fldname = field.getName();
             if (Modifier.isStatic(field.getModifiers())) {
                 if (fldname.startsWith("__doc__") && fldname.length() > 7
-                        && field.getType() == PyString.class) {
+                        && CharSequence.class.isAssignableFrom(field.getType())) {
                     String fname = fldname.substring(7).intern();
                     PyObject memb = dict.__finditem__(fname);
                     if (memb != null && memb instanceof PyReflectedFunction) {
-                        PyString doc = null;
+                        CharSequence doc = null;
                         try {
-                            doc = (PyString)field.get(null);
+                            doc = (CharSequence) field.get(null);
                         } catch (IllegalAccessException e) {
                             throw Py.JavaError(e);
                         }
-                        ((PyReflectedFunction)memb).__doc__ = doc;
+                        ((PyReflectedFunction)memb).__doc__ = doc instanceof PyString ?
+                                (PyString) doc : new PyString(doc.toString());
                     }
                 }
             }
@@ -442,7 +443,7 @@
             }
         }
 
-        for (PyBeanEvent ev : events.values()) {
+        for (PyBeanEvent<?> ev : events.values()) {
             if (dict.__finditem__(ev.__name__) == null) {
                 dict.__setitem__(ev.__name__, ev);
             }
@@ -726,6 +727,7 @@
 
         @SuppressWarnings("unchecked")  // thanks to Bas de Bakker for the tip!
         T clone = (T) cin.readObject();
+        cin.close();
         return clone;
     }
 
@@ -887,6 +889,7 @@
             super(name, numArgs);
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public PyObject __call__(PyObject arg) {
             Object asjava = arg.__tojava__(Object.class);
@@ -938,9 +941,10 @@
         final Map<Class<?>, PyBuiltinMethod[]> proxies = new HashMap<>();
 
         PyBuiltinMethodNarrow iterableProxy = new PyBuiltinMethodNarrow("__iter__") {
+            @SuppressWarnings("unchecked")
             @Override
             public PyObject __call__() {
-                return new JavaIterator(((Iterable) self.getJavaProxy()));
+                return new JavaIterator(((Iterable<Object>) self.getJavaProxy()));
             }
         };
         proxies.put(Iterable.class, new PyBuiltinMethod[]{iterableProxy});
@@ -974,17 +978,19 @@
         proxies.put(Collection.class, new PyBuiltinMethod[]{lenProxy, containsProxy});
 
         PyBuiltinMethodNarrow iteratorProxy = new PyBuiltinMethodNarrow("__iter__") {
+            @SuppressWarnings("unchecked")
             @Override
             public PyObject __call__() {
-                return new JavaIterator(((Iterator) self.getJavaProxy()));
+                return new JavaIterator(((Iterator<Object>) self.getJavaProxy()));
             }
         };
         proxies.put(Iterator.class, new PyBuiltinMethod[]{iteratorProxy});
 
         PyBuiltinMethodNarrow enumerationProxy = new PyBuiltinMethodNarrow("__iter__") {
+            @SuppressWarnings("unchecked")
             @Override
             public PyObject __call__() {
-                return new EnumerationIter(((Enumeration) self.getJavaProxy()));
+                return new EnumerationIter(((Enumeration<Object>) self.getJavaProxy()));
             }
         };
         proxies.put(Enumeration.class, new PyBuiltinMethod[]{enumerationProxy});

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

From jython-checkins at python.org  Thu Jan 19 22:58:29 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Fri, 20 Jan 2017 03:58:29 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Applied_patch_from_=232228_?=
 =?utf-8?q?and_extended_it_to_all_places_where_filename_was?=
Message-ID: <20170120035829.62318.94349.0E80B071@psf.io>

https://hg.python.org/jython/rev/7d7923408952
changeset:   8008:7d7923408952
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Fri Jan 20 04:57:38 2017 +0100
summary:
  Applied patch from #2228 and extended it to all places where filename was manually changed to .class-postfix.

files:
  ACKNOWLEDGMENTS                           |   1 +
  Lib/compileall.py                         |   2 +-
  Lib/distutils/util.py                     |   6 +-
  Lib/imp.py                                |   4 +-
  Lib/zipfile.py                            |   6 +-
  NEWS                                      |   1 +
  src/org/python/core/imp.java              |   4 +-
  src/org/python/core/util/importer.java    |   5 +-
  src/org/python/modules/_imp.java          |  32 +++++-----
  src/org/python/util/JycompileAntTask.java |  10 ++-
  10 files changed, 42 insertions(+), 29 deletions(-)


diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS
--- a/ACKNOWLEDGMENTS
+++ b/ACKNOWLEDGMENTS
@@ -177,6 +177,7 @@
     Doug Clayton
     Carl Wicklow
     James Mudd
+    Mat Booth
 
 Local Variables:
 mode: indented-text
diff --git a/Lib/compileall.py b/Lib/compileall.py
--- a/Lib/compileall.py
+++ b/Lib/compileall.py
@@ -86,7 +86,7 @@
                 try:
                     mtime = int(os.stat(fullname).st_mtime)
                     expect = struct.pack('<4sl', imp.get_magic(), mtime)
-                    cfile = fullname.replace('.py', '$py.class')
+                    cfile = imp._makeCompiledFilename(fullname)
                     with open(cfile, 'rb') as chandle:
                         actual = chandle.read(8)
                     if expect == actual:
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -534,7 +534,7 @@
     # mode simply calls 'byte_compile()' in direct mode, a weird sort of
     # cross-process recursion.  Hey, it works!
     else:
-        from py_compile import compile
+        import py_compile
 
         for file in py_files:
             if file[-3:] != ".py":
@@ -546,7 +546,7 @@
             #   cfile - byte-compiled file
             #   dfile - purported source filename (same as 'file' by default)
             if sys.platform.startswith('java'):
-                cfile = file[:-3] + '$py.class'
+                cfile = py_compile.imp._makeCompiledFilename(file)
             else:
                 cfile = file + (__debug__ and "c" or "o")
             dfile = file
@@ -564,7 +564,7 @@
                 if force or newer(file, cfile):
                     log.info("byte-compiling %s to %s", file, cfile_base)
                     if not dry_run:
-                        compile(file, cfile, dfile)
+                        py_compile.compile(file, cfile, dfile)
                 else:
                     log.debug("skipping byte-compilation of %s to %s",
                               file, cfile_base)
diff --git a/Lib/imp.py b/Lib/imp.py
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -4,7 +4,8 @@
                   __doc__, acquire_lock, find_module, getClass, get_magic, get_suffixes,
                   is_builtin, is_frozen,
                   load_compiled, load_dynamic, load_module, load_source,
-                  lock_held, new_module, release_lock, reload)
+                  lock_held, new_module, release_lock, reload,
+                  makeCompiledFilename as _makeCompiledFilename)
 
 
 class NullImporter(object):
@@ -15,4 +16,3 @@
 
     def find_module(self, fullname, path=None):
         return None
-
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1425,7 +1425,11 @@
         /python/lib/string, return (/python/lib/string.pyc, string).
         """
         file_py  = pathname + ".py"
-        file_pyc = pathname + (".pyc" if not _is_jython else "$py.class")
+        if _is_jython:
+            import imp
+            file_pyc = imp._makeCompiledFilename(file_py)
+        else:
+            file_pyc = pathname + ".pyc"
         file_pyo = pathname + ".pyo"
         if os.path.isfile(file_pyo) and \
                             os.stat(file_pyo).st_mtime >= os.stat(file_py).st_mtime:
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2228 ] Re-use "makeCompiledFilename" function where possible
     - [ 608632 ] __doc__foo should accept java String
     - [ 2523 ] defaultdict.__getitem__() does not propagate exceptions raised by calling
                default_factory
diff --git a/src/org/python/core/imp.java b/src/org/python/core/imp.java
--- a/src/org/python/core/imp.java
+++ b/src/org/python/core/imp.java
@@ -602,7 +602,7 @@
     static PyObject loadFromSource(PySystemState sys, String name, String modName, String entry) {
         String dirName = sys.getPath(entry);
         String sourceName = "__init__.py";
-        String compiledName = "__init__$py.class";
+        String compiledName = makeCompiledFilename(sourceName);
         // display names are for identification purposes (e.g. __file__): when entry is
         // null it forces java.io.File to be a relative path (e.g. foo/bar.py instead of
         // /tmp/foo/bar.py)
@@ -633,7 +633,7 @@
         if (!pkg) {
             Py.writeDebug(IMPORT_LOG, "trying source " + dir.getPath());
             sourceName = name + ".py";
-            compiledName = name + "$py.class";
+            compiledName = makeCompiledFilename(sourceName);
             displaySourceName = new File(displayDirName, sourceName).getPath();
             displayCompiledName = new File(displayDirName, compiledName).getPath();
             sourceFile = new File(dirName, sourceName);
diff --git a/src/org/python/core/util/importer.java b/src/org/python/core/util/importer.java
--- a/src/org/python/core/util/importer.java
+++ b/src/org/python/core/util/importer.java
@@ -80,10 +80,11 @@
     protected abstract Bundle makeBundle(String filenameAndSuffix, T entry);
 
     private SearchOrderEntry[] makeSearchOrder(){
+        String initName = "__init__.py";
         return new SearchOrderEntry[] {
-            new SearchOrderEntry(getSeparator() + "__init__$py.class",
+            new SearchOrderEntry(getSeparator() + imp.makeCompiledFilename(initName),
                                  EnumSet.of(EntryType.IS_PACKAGE, EntryType.IS_BYTECODE)),
-            new SearchOrderEntry(getSeparator() + "__init__.py",
+            new SearchOrderEntry(getSeparator() + initName,
                                  EnumSet.of(EntryType.IS_PACKAGE, EntryType.IS_SOURCE)),
             new SearchOrderEntry("$py.class", EnumSet.of(EntryType.IS_BYTECODE)),
             new SearchOrderEntry(".py", EnumSet.of(EntryType.IS_SOURCE)),};
diff --git a/src/org/python/modules/_imp.java b/src/org/python/modules/_imp.java
--- a/src/org/python/modules/_imp.java
+++ b/src/org/python/modules/_imp.java
@@ -2,6 +2,7 @@
 package org.python.modules;
 
 import org.python.core.__builtin__;
+import org.python.core.imp;
 import org.python.core.Py;
 import org.python.core.PyFile;
 import org.python.core.PyList;
@@ -60,7 +61,7 @@
     }
 
     private static boolean caseok(File file, String filename) {
-        return org.python.core.imp.caseok(file, filename);
+        return imp.caseok(file, filename);
     }
 
     /**
@@ -74,7 +75,7 @@
     static ModuleInfo findFromSource(String name, String entry, boolean findingPackage,
                                      boolean preferSource) {
         String sourceName = "__init__.py";
-        String compiledName = "__init__$py.class";
+        String compiledName = makeCompiledFilename(sourceName);
         String directoryName = PySystemState.getPathLazy(entry);
         // displayDirName is for identification purposes: when null it
         // forces java.io.File to be a relative path (e.g. foo/bar.py
@@ -96,7 +97,7 @@
             } else {
                 Py.writeDebug("import", "trying source " + dir.getPath());
                 sourceName = name + ".py";
-                compiledName = name + "$py.class";
+                compiledName = makeCompiledFilename(sourceName);
                 sourceFile = new File(directoryName, sourceName);
                 compiledFile = new File(directoryName, compiledName);
             }
@@ -152,8 +153,8 @@
         }
         PySystemState sys = Py.getSystemState();
         String compiledFilename =
-                org.python.core.imp.makeCompiledFilename(sys.getPath(filename));
-        mod = org.python.core.imp.createFromSource(modname.intern(), (InputStream)o,
+                makeCompiledFilename(sys.getPath(filename));
+        mod = imp.createFromSource(modname.intern(), (InputStream)o,
                                                    filename, compiledFilename);
         PyObject modules = sys.modules;
         modules.__setitem__(modname.intern(), mod);
@@ -180,7 +181,7 @@
         if (sourceName.endsWith("$py.class")) {
             sourceName = sourceName.substring(0, sourceName.length() - 9) + ".py";
         }
-        return org.python.core.imp.loadFromCompiled(name.intern(), stream, sourceName, pathname);
+        return imp.loadFromCompiled(name.intern(), stream, sourceName, pathname);
     }
 
     public static PyObject find_module(String name) {
@@ -226,7 +227,7 @@
 
                     // XXX: This should load the accompanying byte code file instead, if it exists
                     String resolvedFilename = sys.getPath(filename.toString());
-                    compiledName = org.python.core.imp.makeCompiledFilename(resolvedFilename);
+                    compiledName = makeCompiledFilename(resolvedFilename);
                     if (name.endsWith(".__init__")) {
                         name = name.substring(0, name.length() - ".__init__".length());
                     } else if (name.equals("__init__")) {
@@ -239,17 +240,14 @@
                         mtime = fp.lastModified();
                     }
 
-                    mod = org.python.core.imp.createFromSource(name.intern(),
-                                                               (InputStream)o,
-                                                               filename.toString(),
-                                                               compiledName,
-                                                               mtime);
+                    mod = imp.createFromSource(name.intern(), (InputStream)o,
+                            filename.toString(), compiledName, mtime);
                     break;
                 case PY_COMPILED:
                     mod = load_compiled(name, filename.toString(), file);
                     break;
                 case PKG_DIRECTORY:
-                    PyModule m = org.python.core.imp.addModule(name);
+                    PyModule m = imp.addModule(name);
                     m.__dict__.__setitem__("__path__", new PyList(new PyObject[] {filename}));
                     m.__dict__.__setitem__("__file__", filename);
                     ModuleInfo mi = findFromSource(name, filename.toString(), true, true);
@@ -266,10 +264,14 @@
         return mod;
     }
 
+    public static String makeCompiledFilename(String filename) {
+        return imp.makeCompiledFilename(filename);
+    }
+
     public static PyObject get_magic() {
-	return new PyString("\u0003\u00f3\r\n");
+        return new PyString("\u0003\u00f3\r\n");
     }
-    
+
     public static PyObject get_suffixes() {
         return new PyList(new PyObject[] {new PyTuple(new PyString(".py"),
                                                       new PyString("r"),
diff --git a/src/org/python/util/JycompileAntTask.java b/src/org/python/util/JycompileAntTask.java
--- a/src/org/python/util/JycompileAntTask.java
+++ b/src/org/python/util/JycompileAntTask.java
@@ -33,9 +33,13 @@
                 String name = _py_compile.getModuleName(src);
                 String compiledFilePath = name.replace('.', '/');
                 if (src.getName().endsWith("__init__.py")) {
-                    compiledFilePath += "/__init__";
+                    compiledFilePath += "/__init__.py";
+                } else {
+                    compiledFilePath += ".py";
+                    // so we can apply imp.makeCompiledFilename
                 }
-                File compiled = new File(destDir, compiledFilePath + "$py.class");
+                File compiled = new File(destDir,
+                        imp.makeCompiledFilename(compiledFilePath));
                 compile(src, compiled, name);
             } catch (RuntimeException e) {
                 log("Could not compile " + src);
@@ -69,6 +73,6 @@
     }
 
     protected String getTo() {
-        return "*$py.class";
+        return imp.makeCompiledFilename(getFrom());
     }
 }

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

From jython-checkins at python.org  Fri Jan 20 00:59:28 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Fri, 20 Jan 2017 05:59:28 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Merged_PR_=2328_without_the?=
 =?utf-8?q?_test=2E_Extended_the_patch_to_a_third_line_and_also?=
Message-ID: <20170120055928.6705.34963.3600971C@psf.io>

https://hg.python.org/jython/rev/a0be85d92cc5
changeset:   8009:a0be85d92cc5
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Fri Jan 20 06:59:12 2017 +0100
summary:
  Merged PR #28 without the test. Extended the patch to a third line and also cleaned up tabs on this occasion.

files:
  src/org/python/modules/zipimport/zipimporter.java |  20 +++++-----
  1 files changed, 10 insertions(+), 10 deletions(-)


diff --git a/src/org/python/modules/zipimport/zipimporter.java b/src/org/python/modules/zipimport/zipimporter.java
--- a/src/org/python/modules/zipimport/zipimporter.java
+++ b/src/org/python/modules/zipimport/zipimporter.java
@@ -34,7 +34,7 @@
  * Import Python modules and packages from ZIP-format archives.
  *
  * @author Philip Jenvey
- */
+ */    
 @ExposedType(name = "zipimport.zipimporter", base = PyObject.class)
 public class zipimporter extends importer<PyObject> implements Traverseproc {
 
@@ -246,7 +246,7 @@
     final PyObject zipimporter_get_filename(String fullname) {
         ModuleCodeData moduleCodeData = getModuleCode(fullname);
         if (moduleCodeData != null) {
-            return new PyString(moduleCodeData.path);
+            return Py.newStringOrUnicode(moduleCodeData.path);
         }
         return Py.None;
     }
@@ -397,7 +397,7 @@
             ZipEntry zipEntry = zipEntries.nextElement();
             String name = zipEntry.getName().replace('/', File.separatorChar);
 
-            PyObject __file__ = new PyString(archive + File.separator + name);
+            PyObject __file__ = Py.newStringOrUnicode(archive + File.separator + name);
             PyObject compress = Py.newInteger(zipEntry.getMethod());
             PyObject data_size = new PyLong(zipEntry.getCompressedSize());
             PyObject file_size = new PyLong(zipEntry.getSize());
@@ -411,7 +411,7 @@
 
             PyTuple entry = new PyTuple(__file__, compress, data_size, file_size, file_offset,
                                         time, date, crc);
-            files.__setitem__(new PyString(name), entry);
+            files.__setitem__(Py.newStringOrUnicode(name), entry);
         }
     }
 
@@ -550,12 +550,12 @@
     /* Traverseproc implementation */
     @Override
     public int traverse(Visitproc visit, Object arg) {
-    	if (files != null) {
-    		int retVal = visit.visit(files, arg);
-    		if (retVal != 0) {
-    			return retVal;
-    		}
-    	}
+        if (files != null) {
+            int retVal = visit.visit(files, arg);
+            if (retVal != 0) {
+                return retVal;
+            }
+        }
         return sys == null ? 0 : visit.visit(sys, arg);
     }
 

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

From jython-checkins at python.org  Fri Jan 20 01:10:48 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Fri, 20 Jan 2017 06:10:48 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Additions_to_previous_commi?=
 =?utf-8?q?t=2E?=
Message-ID: <20170120061039.7136.22499.9A385F9C@psf.io>

https://hg.python.org/jython/rev/fdcc473aa9d1
changeset:   8010:fdcc473aa9d1
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Fri Jan 20 07:10:34 2017 +0100
summary:
  Additions to previous commit.

files:
  ACKNOWLEDGMENTS                                   |  1 +
  NEWS                                              |  1 +
  src/org/python/modules/zipimport/zipimporter.java |  2 +-
  3 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS
--- a/ACKNOWLEDGMENTS
+++ b/ACKNOWLEDGMENTS
@@ -178,6 +178,7 @@
     Carl Wicklow
     James Mudd
     Mat Booth
+    Alex Gaman
 
 Local Variables:
 mode: indented-text
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ PR28 ] zipimporter supports multi-byte characters in pathnames
     - [ 2228 ] Re-use "makeCompiledFilename" function where possible
     - [ 608632 ] __doc__foo should accept java String
     - [ 2523 ] defaultdict.__getitem__() does not propagate exceptions raised by calling
diff --git a/src/org/python/modules/zipimport/zipimporter.java b/src/org/python/modules/zipimport/zipimporter.java
--- a/src/org/python/modules/zipimport/zipimporter.java
+++ b/src/org/python/modules/zipimport/zipimporter.java
@@ -34,7 +34,7 @@
  * Import Python modules and packages from ZIP-format archives.
  *
  * @author Philip Jenvey
- */    
+ */
 @ExposedType(name = "zipimport.zipimporter", base = PyObject.class)
 public class zipimporter extends importer<PyObject> implements Traverseproc {
 

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

From jython-checkins at python.org  Tue Jan 31 18:48:10 2017
From: jython-checkins at python.org (stefan.richthofer)
Date: Tue, 31 Jan 2017 23:48:10 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Fixed_issue_=232511=2E?=
Message-ID: <20170131234810.3858.46508.F21B0911@psf.io>

https://hg.python.org/jython/rev/a408636f6735
changeset:   8011:a408636f6735
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Wed Feb 01 00:45:20 2017 +0100
summary:
  Fixed issue #2511.

files:
  NEWS                              |  1 +
  src/org/python/core/PyString.java |  6 +++++-
  2 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 
 Jython 2.7.1rc1
   Bugs fixed
+    - [ 2511 ] Percent operator calls __getattr__('__getitem__')
     - [ PR28 ] zipimporter supports multi-byte characters in pathnames
     - [ 2228 ] Re-use "makeCompiledFilename" function where possible
     - [ 608632 ] __doc__foo should accept java String
diff --git a/src/org/python/core/PyString.java b/src/org/python/core/PyString.java
--- a/src/org/python/core/PyString.java
+++ b/src/org/python/core/PyString.java
@@ -4524,7 +4524,11 @@
             // Not a tuple, but possibly still some kind of container: use special argIndex values.
             argIndex = -1;
             if (args instanceof AbstractDict
-                    || (!(args instanceof PySequence) && args.__findattr__("__getitem__") != null)) {
+                    || (!(args instanceof PySequence) &&
+                    // See issue 2511: __getitem__ should be looked up directly in the dict, rather
+                    // than going through another __getattr__-call, so we use object___findattr__
+                    // instead of generic __findattr__.
+                    args.object___findattr__("__getitem__") != null)) {
                 dict = args;
                 argIndex = -3;
             }

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