Skip to content

Commit baf21ba

Browse files
committed
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... :)
1 parent 6cdb091 commit baf21ba

File tree

144 files changed

+568
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+568
-570
lines changed

src/org/python/antlr/ast/AssertDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/AssignDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/AttributeDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/AugAssignDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/BinOpDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/BoolOpDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/BreakDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/CallDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/ClassDefDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

src/org/python/antlr/ast/CompareDerived.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ public int traverseDerived(Visitproc visit,Object arg) {
4747

4848
/* end of TraverseprocDerived implementation */
4949

50-
private AbstractDict dict;
50+
private PyObject dict;
5151

52-
public AbstractDict fastGetDict() {
52+
public PyObject fastGetDict() {
5353
return dict;
5454
}
5555

56-
public AbstractDict getDict() {
56+
public PyObject getDict() {
5757
return dict;
5858
}
5959

6060
public void setDict(PyObject newDict) {
6161
if (newDict instanceof AbstractDict) {
62-
dict=(AbstractDict)newDict;
62+
dict=newDict;
6363
if (dict.__finditem__(PyString.fromInterned("__del__"))!=null&&!JyAttribute.hasAttr(this,JyAttribute.FINALIZE_TRIGGER_ATTR)) {
6464
FinalizeTrigger.ensureFinalizer(this);
6565
}

0 commit comments

Comments
 (0)