# HG changeset patch # User Paul Boddie # Date 1105397539 -3600 # Node ID 790ece285cc36ceb0790bf94c7afe34f737c9f67 # Parent 83efe2ce143fb4bd81824df5ad0e1278776c63b1 Moved the lang module contents into the lang package. Fixed various java.lang and java.io circular imports by introducing a java.lang._object module. Corrected various base classes (object -> java.lang.Object, Exception -> java.lang.Exception) and fixed raising of exceptions in certain cases. diff -r 83efe2ce143f -r 790ece285cc3 java/util.py --- a/java/util.py Mon Jan 10 23:52:19 2005 +0100 +++ b/java/util.py Mon Jan 10 23:52:19 2005 +0100 @@ -1,17 +1,19 @@ #!/usr/bin/env python +import java.lang + # Interfaces. -class Collection(object): +class Collection(java.lang.Object): pass -class Iterator(object): +class Iterator(java.lang.Object): pass -class List(object): +class List(java.lang.Object): pass -class Map(object): +class Map(java.lang.Object): pass class Set(Collection): @@ -22,12 +24,12 @@ class AbstractMap(Map): pass -class Dictionary(object): +class Dictionary(java.lang.Object): pass # Exceptions. -class NoSuchElementException(object): +class NoSuchElementException(java.lang.Exception): pass # Special Python classes. @@ -57,7 +59,7 @@ # Classes. -class EventObject(object): +class EventObject(java.lang.Object): def __init__(self, source): self.source = source def getSource(self): @@ -127,7 +129,7 @@ setattr(HashSet, "__init_____", HashSet.__init__) -class ResourceBundle(object): +class ResourceBundle(java.lang.Object): def __init__(self, *args): # NOTE: To be implemented. pass