bd3e41
diff -ru mythes-en-3.0/wn2ooo/wn2ooo.py mythes-en-3.0.fixed/wn2ooo/wn2ooo.py
bd3e41
--- mythes-en-3.0/wn2ooo/wn2ooo.py	2005-07-23 23:21:20.000000000 +0100
bd3e41
+++ mythes-en-3.0.fixed/wn2ooo/wn2ooo.py	2018-07-30 14:46:52.695201526 +0100
bd3e41
@@ -65,7 +65,7 @@
bd3e41
 				entry = getRelatedTerms(u, HYPERNYM, '')
bd3e41
 			try:
bd3e41
 				listpos = l.index(entry)
bd3e41
-			except ValueError, e:
bd3e41
+			except ValueError as e:
bd3e41
 				l.append(entry)
bd3e41
 	return str.join("|", l)
bd3e41
 	
bd3e41
@@ -74,12 +74,12 @@
bd3e41
 	for word in words:
bd3e41
 		l = []
bd3e41
 		if c % 100 == 0:
bd3e41
-			print >> sys.stderr, "Working on word %d" % c
bd3e41
+			print("Working on word %d" % c, file=sys.stderr)
bd3e41
 		for pos in [ADJ, N, V, ADV]:
bd3e41
 			try:
bd3e41
 				for s in pos[word].getSenses():
bd3e41
 					l.append(s)
bd3e41
-			except KeyError, e:
bd3e41
+			except KeyError as e:
bd3e41
 				#print >> sys.stderr, e
bd3e41
 				continue
bd3e41
 		syn_count = 0
bd3e41
@@ -118,7 +118,7 @@
bd3e41
 					syn_lines = "%s%s" % (syn_lines, more_generic_terms)
bd3e41
 				syn_count = syn_count + 1
bd3e41
 		if syn_count > 0:
bd3e41
-			print "%s|%d\n%s" % (word, syn_count, syn_lines)
bd3e41
+			print("%s|%d\n%s" % (word, syn_count, syn_lines))
bd3e41
 		c = c + 1
bd3e41
 	return
bd3e41
 
bd3e41
@@ -132,40 +132,38 @@
bd3e41
 	return s
bd3e41
 
bd3e41
 def main():
bd3e41
-	print "ISO8859-1"
bd3e41
+	print("ISO8859-1")
bd3e41
 
bd3e41
 	words = {}
bd3e41
 	dic = Dictionary(ADJECTIVE, "adj")
bd3e41
-	for w in dic.keys():
bd3e41
+	for w in list(dic.keys()):
bd3e41
 		words[w] = None
bd3e41
 
bd3e41
 	dic = Dictionary(NOUN, "noun")
bd3e41
-	for w in dic.keys():
bd3e41
+	for w in list(dic.keys()):
bd3e41
 		words[w] = None
bd3e41
 	
bd3e41
 	dic = Dictionary(VERB, "verb")
bd3e41
-	for w in dic.keys():
bd3e41
+	for w in list(dic.keys()):
bd3e41
 		words[w] = None
bd3e41
 
bd3e41
 	dic = Dictionary(ADVERB, "adv")
bd3e41
-	for w in dic.keys():
bd3e41
+	for w in list(dic.keys()):
bd3e41
 		words[w] = None
bd3e41
 
bd3e41
-	words = words.keys()
bd3e41
+	words = list(words.keys())
bd3e41
 	# tests:
bd3e41
 	#words = ['dog', 'house', 'nullipara']
bd3e41
 	#words = ['absent', 'whistle stop']
bd3e41
 	#words = ['war']
bd3e41
-	print >>sys.stderr, "Dictionaries contain %d words" % len(words)
bd3e41
-	print >>sys.stderr, "Sorting..."
bd3e41
-	words.sort(mycompare)
bd3e41
+	print("Dictionaries contain %d words" % len(words), file=sys.stderr)
bd3e41
+	print("Sorting...", file=sys.stderr)
bd3e41
+	words = sorted(words, key=mycompare)
bd3e41
 	printSynsForWords(words)
bd3e41
 	return
bd3e41
 
bd3e41
-def mycompare(a, b):
bd3e41
+def mycompare(elem):
bd3e41
 	# stupid hack to make sure the list is sorted like Kevin's original list:
bd3e41
-	a = a.replace(" ", "Z")
bd3e41
-	b = b.replace(" ", "Z")
bd3e41
-	return cmp(a, b)
bd3e41
+	return elem.replace(" ", "Z")
bd3e41
 
bd3e41
 main()
bd3e41
diff -ru mythes-en-3.0/wn2ooo/wordnet.py mythes-en-3.0.fixed/wn2ooo/wordnet.py
bd3e41
--- mythes-en-3.0/wn2ooo/wordnet.py	2005-07-23 23:21:16.000000000 +0100
bd3e41
+++ mythes-en-3.0.fixed/wn2ooo/wordnet.py	2018-07-30 14:46:52.695201526 +0100
bd3e41
@@ -44,7 +44,6 @@
bd3e41
 import string
bd3e41
 import os
bd3e41
 from os import environ
bd3e41
-from types import IntType, ListType, StringType, TupleType
bd3e41
 
bd3e41
 
bd3e41
 #
bd3e41
@@ -212,15 +211,15 @@
bd3e41
     
bd3e41
     def __init__(self, line):
bd3e41
         """Initialize the word from a line of a WN POS file."""
bd3e41
-	tokens = string.split(line)
bd3e41
-	ints = map(int, tokens[int(tokens[3]) + 4:])
bd3e41
-	self.form = string.replace(tokens[0], '_', ' ')
bd3e41
+        tokens = line.split()
bd3e41
+        ints = list(map(int, tokens[int(tokens[3]) + 4:]))
bd3e41
+        self.form = tokens[0].replace('_', ' ')
bd3e41
         "Orthographic representation of the word."
bd3e41
-	self.pos = _normalizePOS(tokens[1])
bd3e41
+        self.pos = _normalizePOS(tokens[1])
bd3e41
         "Part of speech.  One of NOUN, VERB, ADJECTIVE, ADVERB."
bd3e41
-	self.taggedSenseCount = ints[1]
bd3e41
+        self.taggedSenseCount = ints[1]
bd3e41
         "Number of senses that are tagged."
bd3e41
-	self._synsetOffsets = ints[2:ints[0]+2]
bd3e41
+        self._synsetOffsets = ints[2:ints[0]+2]
bd3e41
     
bd3e41
     def getPointers(self, pointerType=None):
bd3e41
         """Pointers connect senses and synsets, not words.
bd3e41
@@ -233,17 +232,17 @@
bd3e41
         raise self.getPointers.__doc__
bd3e41
 
bd3e41
     def getSenses(self):
bd3e41
-	"""Return a sequence of senses.
bd3e41
-	
bd3e41
-	>>> N['dog'].getSenses()
bd3e41
-	('dog' in {noun: dog, domestic dog, Canis familiaris}, 'dog' in {noun: frump, dog}, 'dog' in {noun: dog}, 'dog' in {noun: cad, bounder, blackguard, dog, hound, heel}, 'dog' in {noun: frank, frankfurter, hotdog, hot dog, dog, wiener, wienerwurst, weenie}, 'dog' in {noun: pawl, detent, click, dog}, 'dog' in {noun: andiron, firedog, dog, dog-iron})
bd3e41
-	"""
bd3e41
-	if not hasattr(self, '_senses'):
bd3e41
-	    def getSense(offset, pos=self.pos, form=self.form):
bd3e41
-		return getSynset(pos, offset)[form]
bd3e41
-	    self._senses = tuple(map(getSense, self._synsetOffsets))
bd3e41
-	    del self._synsetOffsets
bd3e41
-	return self._senses
bd3e41
+        """Return a sequence of senses.
bd3e41
+        
bd3e41
+        >>> N['dog'].getSenses()
bd3e41
+        ('dog' in {noun: dog, domestic dog, Canis familiaris}, 'dog' in {noun: frump, dog}, 'dog' in {noun: dog}, 'dog' in {noun: cad, bounder, blackguard, dog, hound, heel}, 'dog' in {noun: frank, frankfurter, hotdog, hot dog, dog, wiener, wienerwurst, weenie}, 'dog' in {noun: pawl, detent, click, dog}, 'dog' in {noun: andiron, firedog, dog, dog-iron})
bd3e41
+        """
bd3e41
+        if not hasattr(self, '_senses'):
bd3e41
+            def getSense(offset, pos=self.pos, form=self.form):
bd3e41
+                return getSynset(pos, offset)[form]
bd3e41
+            self._senses = tuple(map(getSense, self._synsetOffsets))
bd3e41
+            del self._synsetOffsets
bd3e41
+        return self._senses
bd3e41
 
bd3e41
     # Deprecated.  Present for backwards compatability.
bd3e41
     def senses(self):
bd3e41
@@ -255,70 +254,70 @@
bd3e41
         return self.getSense()
bd3e41
     
bd3e41
     def isTagged(self):
bd3e41
-	"""Return 1 if any sense is tagged.
bd3e41
-	
bd3e41
-	>>> N['dog'].isTagged()
bd3e41
-	1
bd3e41
-	"""
bd3e41
-	return self.taggedSenseCount > 0
bd3e41
+        """Return 1 if any sense is tagged.
bd3e41
+        
bd3e41
+        >>> N['dog'].isTagged()
bd3e41
+        1
bd3e41
+        """
bd3e41
+        return self.taggedSenseCount > 0
bd3e41
     
bd3e41
     def getAdjectivePositions(self):
bd3e41
-	"""Return a sequence of adjective positions that this word can
bd3e41
-	appear in.  These are elements of ADJECTIVE_POSITIONS.
bd3e41
-	
bd3e41
-	>>> ADJ['clear'].getAdjectivePositions()
bd3e41
-	[None, 'predicative']
bd3e41
-	"""
bd3e41
-	positions = {}
bd3e41
-	for sense in self.getSenses():
bd3e41
-	    positions[sense.position] = 1
bd3e41
-	return positions.keys()
bd3e41
+        """Return a sequence of adjective positions that this word can
bd3e41
+        appear in.  These are elements of ADJECTIVE_POSITIONS.
bd3e41
+        
bd3e41
+        >>> ADJ['clear'].getAdjectivePositions()
bd3e41
+        [None, 'predicative']
bd3e41
+        """
bd3e41
+        positions = {}
bd3e41
+        for sense in self.getSenses():
bd3e41
+            positions[sense.position] = 1
bd3e41
+        return list(positions.keys())
bd3e41
 
bd3e41
     adjectivePositions = getAdjectivePositions # backwards compatability
bd3e41
     
bd3e41
     def __cmp__(self, other):
bd3e41
-	"""
bd3e41
-	>>> N['cat'] < N['dog']
bd3e41
-	1
bd3e41
-	>>> N['dog'] < V['dog']
bd3e41
-	1
bd3e41
-	"""
bd3e41
-	return _compareInstances(self, other, ('pos', 'form'))
bd3e41
+        """
bd3e41
+        >>> N['cat'] < N['dog']
bd3e41
+        1
bd3e41
+        >>> N['dog'] < V['dog']
bd3e41
+        1
bd3e41
+        """
bd3e41
+        return _compareInstances(self, other, ('pos', 'form'))
bd3e41
     
bd3e41
     def __str__(self):
bd3e41
-	"""Return a human-readable representation.
bd3e41
-	
bd3e41
-	>>> str(N['dog'])
bd3e41
-	'dog(n.)'
bd3e41
-	"""
bd3e41
-	abbrs = {NOUN: 'n.', VERB: 'v.', ADJECTIVE: 'adj.', ADVERB: 'adv.'}
bd3e41
-	return self.form + "(" + abbrs[self.pos] + ")"
bd3e41
+        """Return a human-readable representation.
bd3e41
+        
bd3e41
+        >>> str(N['dog'])
bd3e41
+        'dog(n.)'
bd3e41
+        """
bd3e41
+        abbrs = {NOUN: 'n.', VERB: 'v.', ADJECTIVE: 'adj.', ADVERB: 'adv.'}
bd3e41
+        return self.form + "(" + abbrs[self.pos] + ")"
bd3e41
     
bd3e41
     def __repr__(self):
bd3e41
-	"""If ReadableRepresentations is true, return a human-readable
bd3e41
-	representation, e.g. 'dog(n.)'.
bd3e41
-	
bd3e41
-	If ReadableRepresentations is false, return a machine-readable
bd3e41
-	representation, e.g. "getWord('dog', 'noun')".
bd3e41
-	"""
bd3e41
-	if ReadableRepresentations:
bd3e41
-	    return str(self)
bd3e41
-	return "getWord" + `(self.form, self.pos)`
bd3e41
-	
bd3e41
+        """If ReadableRepresentations is true, return a human-readable
bd3e41
+        representation, e.g. 'dog(n.)'.
bd3e41
+        
bd3e41
+        If ReadableRepresentations is false, return a machine-readable
bd3e41
+        representation, e.g. "getWord('dog', 'noun')".
bd3e41
+        """
bd3e41
+        if ReadableRepresentations:
bd3e41
+            return str(self)
bd3e41
+        return "getWord" + repr((self.form, self.pos))
bd3e41
+        
bd3e41
     #
bd3e41
     # Sequence protocol (a Word's elements are its Senses)
bd3e41
     #
bd3e41
-    def __nonzero__(self):
bd3e41
-	return 1
bd3e41
+    def __bool__(self):
bd3e41
+        return 1
bd3e41
     
bd3e41
     def __len__(self):
bd3e41
-	return len(self.getSenses())
bd3e41
+        return len(self.getSenses())
bd3e41
     
bd3e41
     def __getitem__(self, index):
bd3e41
-	return self.getSenses()[index]
bd3e41
+        return self.getSenses()[index]
bd3e41
     
bd3e41
     def __getslice__(self, i, j):
bd3e41
-	return self.getSenses()[i:j]
bd3e41
+        return self.getSenses()[i:j]
bd3e41
 
bd3e41
 
bd3e41
 class Synset:
bd3e41
@@ -356,157 +355,157 @@
bd3e41
     
bd3e41
     def __init__(self, pos, offset, line):
bd3e41
         "Initialize the synset from a line off a WN synset file."
bd3e41
-	self.pos = pos
bd3e41
+        self.pos = pos
bd3e41
         "part of speech -- one of NOUN, VERB, ADJECTIVE, ADVERB."
bd3e41
-	self.offset = offset
bd3e41
+        self.offset = offset
bd3e41
         """integer offset into the part-of-speech file.  Together
bd3e41
         with pos, this can be used as a unique id."""
bd3e41
-	tokens = string.split(line[:string.index(line, '|')])
bd3e41
-	self.ssType = tokens[2]
bd3e41
-	self.gloss = string.strip(line[string.index(line, '|') + 1:])
bd3e41
+        tokens = line[:line.index('|')].split()
bd3e41
+        self.ssType = tokens[2]
bd3e41
+        self.gloss = line[line.index('|') + 1:].strip()
bd3e41
         self.lexname = Lexname.lexnames[int(tokens[1])]
bd3e41
-	(self._senseTuples, remainder) = _partition(tokens[4:], 2, string.atoi(tokens[3], 16))
bd3e41
-	(self._pointerTuples, remainder) = _partition(remainder[1:], 4, int(remainder[0]))
bd3e41
-	if pos == VERB:
bd3e41
-	    (vfTuples, remainder) = _partition(remainder[1:], 3, int(remainder[0]))
bd3e41
-	    def extractVerbFrames(index, vfTuples):
bd3e41
-		return tuple(map(lambda t:string.atoi(t[1]), filter(lambda t,i=index:string.atoi(t[2],16) in (0, i), vfTuples)))
bd3e41
-	    senseVerbFrames = []
bd3e41
-	    for index in range(1, len(self._senseTuples) + 1):
bd3e41
-		senseVerbFrames.append(extractVerbFrames(index, vfTuples))
bd3e41
-	    self._senseVerbFrames = senseVerbFrames
bd3e41
-	    self.verbFrames = tuple(extractVerbFrames(None, vfTuples))
bd3e41
+        (self._senseTuples, remainder) = _partition(tokens[4:], 2, int(tokens[3], 16))
bd3e41
+        (self._pointerTuples, remainder) = _partition(remainder[1:], 4, int(remainder[0]))
bd3e41
+        if pos == VERB:
bd3e41
+            (vfTuples, remainder) = _partition(remainder[1:], 3, int(remainder[0]))
bd3e41
+            def extractVerbFrames(index, vfTuples):
bd3e41
+                return tuple([int(t[1]) for t in list(filter(lambda t,i=index:int(t[2],16) in (0, i), vfTuples))])
bd3e41
+            senseVerbFrames = []
bd3e41
+            for index in range(1, len(self._senseTuples) + 1):
bd3e41
+                senseVerbFrames.append(extractVerbFrames(index, vfTuples))
bd3e41
+            self._senseVerbFrames = senseVerbFrames
bd3e41
+            self.verbFrames = tuple(extractVerbFrames(None, vfTuples))
bd3e41
             """A sequence of integers that index into
bd3e41
             VERB_FRAME_STRINGS. These list the verb frames that any
bd3e41
             Sense in this synset participates in.  (See also
bd3e41
             Sense.verbFrames.) Defined only for verbs."""
bd3e41
     
bd3e41
     def getSenses(self):
bd3e41
-	"""Return a sequence of Senses.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].getSenses()
bd3e41
-	('dog' in {noun: dog, domestic dog, Canis familiaris},)
bd3e41
-	"""
bd3e41
-	if not hasattr(self, '_senses'):
bd3e41
-	    def loadSense(senseTuple, verbFrames=None, synset=self):
bd3e41
-		return Sense(synset, senseTuple, verbFrames)
bd3e41
-	    if self.pos == VERB:
bd3e41
-		self._senses = tuple(map(loadSense, self._senseTuples, self._senseVerbFrames))
bd3e41
-		del self._senseVerbFrames
bd3e41
-	    else:
bd3e41
-		self._senses = tuple(map(loadSense, self._senseTuples))
bd3e41
-	    del self._senseTuples
bd3e41
-	return self._senses
bd3e41
+        """Return a sequence of Senses.
bd3e41
+        
bd3e41
+        >>> N['dog'][0].getSenses()
bd3e41
+        ('dog' in {noun: dog, domestic dog, Canis familiaris},)
bd3e41
+        """
bd3e41
+        if not hasattr(self, '_senses'):
bd3e41
+            def loadSense(senseTuple, verbFrames=None, synset=self):
bd3e41
+                return Sense(synset, senseTuple, verbFrames)
bd3e41
+            if self.pos == VERB:
bd3e41
+                self._senses = tuple(map(loadSense, self._senseTuples, self._senseVerbFrames))
bd3e41
+                del self._senseVerbFrames
bd3e41
+            else:
bd3e41
+                self._senses = tuple(map(loadSense, self._senseTuples))
bd3e41
+            del self._senseTuples
bd3e41
+        return self._senses
bd3e41
 
bd3e41
     senses = getSenses
bd3e41
 
bd3e41
     def getPointers(self, pointerType=None):
bd3e41
-	"""Return a sequence of Pointers.
bd3e41
+        """Return a sequence of Pointers.
bd3e41
 
bd3e41
         If pointerType is specified, only pointers of that type are
bd3e41
         returned.  In this case, pointerType should be an element of
bd3e41
         POINTER_TYPES.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].getPointers()[:5]
bd3e41
-	(hypernym -> {noun: canine, canid}, member meronym -> {noun: Canis, genus Canis}, member meronym -> {noun: pack}, hyponym -> {noun: pooch, doggie, doggy, barker, bow-wow}, hyponym -> {noun: cur, mongrel, mutt})
bd3e41
-	>>> N['dog'][0].getPointers(HYPERNYM)
bd3e41
-	(hypernym -> {noun: canine, canid},)
bd3e41
-	"""
bd3e41
-	if not hasattr(self, '_pointers'):
bd3e41
-	    def loadPointer(tuple, synset=self):
bd3e41
-		return Pointer(synset.offset, tuple)
bd3e41
-	    self._pointers = tuple(map(loadPointer, self._pointerTuples))
bd3e41
-	    del self._pointerTuples
bd3e41
-	if pointerType == None:
bd3e41
-	    return self._pointers
bd3e41
-	else:
bd3e41
-	    _requirePointerType(pointerType)
bd3e41
-	    return filter(lambda pointer, type=pointerType: pointer.type == type, self._pointers)
bd3e41
+        
bd3e41
+        >>> N['dog'][0].getPointers()[:5]
bd3e41
+        (hypernym -> {noun: canine, canid}, member meronym -> {noun: Canis, genus Canis}, member meronym -> {noun: pack}, hyponym -> {noun: pooch, doggie, doggy, barker, bow-wow}, hyponym -> {noun: cur, mongrel, mutt})
bd3e41
+        >>> N['dog'][0].getPointers(HYPERNYM)
bd3e41
+        (hypernym -> {noun: canine, canid},)
bd3e41
+        """
bd3e41
+        if not hasattr(self, '_pointers'):
bd3e41
+            def loadPointer(tuple, synset=self):
bd3e41
+                return Pointer(synset.offset, tuple)
bd3e41
+            self._pointers = tuple(map(loadPointer, self._pointerTuples))
bd3e41
+            del self._pointerTuples
bd3e41
+        if pointerType == None:
bd3e41
+            return self._pointers
bd3e41
+        else:
bd3e41
+            _requirePointerType(pointerType)
bd3e41
+            return list(filter(lambda pointer, type=pointerType: pointer.type == type, self._pointers))
bd3e41
 
bd3e41
     pointers = getPointers # backwards compatability
bd3e41
     
bd3e41
     def getPointerTargets(self, pointerType=None):
bd3e41
-	"""Return a sequence of Senses or Synsets.
bd3e41
-	
bd3e41
+        """Return a sequence of Senses or Synsets.
bd3e41
+        
bd3e41
         If pointerType is specified, only targets of pointers of that
bd3e41
         type are returned.  In this case, pointerType should be an
bd3e41
         element of POINTER_TYPES.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].getPointerTargets()[:5]
bd3e41
-	[{noun: canine, canid}, {noun: Canis, genus Canis}, {noun: pack}, {noun: pooch, doggie, doggy, barker, bow-wow}, {noun: cur, mongrel, mutt}]
bd3e41
-	>>> N['dog'][0].getPointerTargets(HYPERNYM)
bd3e41
-	[{noun: canine, canid}]
bd3e41
-	"""
bd3e41
-	return map(Pointer.target, self.getPointers(pointerType))
bd3e41
+        
bd3e41
+        >>> N['dog'][0].getPointerTargets()[:5]
bd3e41
+        [{noun: canine, canid}, {noun: Canis, genus Canis}, {noun: pack}, {noun: pooch, doggie, doggy, barker, bow-wow}, {noun: cur, mongrel, mutt}]
bd3e41
+        >>> N['dog'][0].getPointerTargets(HYPERNYM)
bd3e41
+        [{noun: canine, canid}]
bd3e41
+        """
bd3e41
+        return list(map(Pointer.target, self.getPointers(pointerType)))
bd3e41
 
bd3e41
     pointerTargets = getPointerTargets # backwards compatability
bd3e41
     
bd3e41
     def isTagged(self):
bd3e41
-	"""Return 1 if any sense is tagged.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].isTagged()
bd3e41
-	1
bd3e41
-	>>> N['dog'][1].isTagged()
bd3e41
-	0
bd3e41
-	"""
bd3e41
-	return len(filter(Sense.isTagged, self.getSenses())) > 0
bd3e41
+        """Return 1 if any sense is tagged.
bd3e41
+        
bd3e41
+        >>> N['dog'][0].isTagged()
bd3e41
+        1
bd3e41
+        >>> N['dog'][1].isTagged()
bd3e41
+        0
bd3e41
+        """
bd3e41
+        return len(list(filter(Sense.isTagged, self.getSenses()))) > 0
bd3e41
     
bd3e41
     def __str__(self):
bd3e41
-	"""Return a human-readable representation.
bd3e41
-	
bd3e41
-	>>> str(N['dog'][0].synset)
bd3e41
-	'{noun: dog, domestic dog, Canis familiaris}'
bd3e41
-	"""
bd3e41
-	return "{" + self.pos + ": " + string.joinfields(map(lambda sense:sense.form, self.getSenses()), ", ") + "}"
bd3e41
+        """Return a human-readable representation.
bd3e41
+        
bd3e41
+        >>> str(N['dog'][0].synset)
bd3e41
+        '{noun: dog, domestic dog, Canis familiaris}'
bd3e41
+        """
bd3e41
+        return "{" + self.pos + ": " + string.joinfields([sense.form for sense in self.getSenses()], ", ") + "}"
bd3e41
     
bd3e41
     def __repr__(self):
bd3e41
-	"""If ReadableRepresentations is true, return a human-readable
bd3e41
-	representation, e.g. 'dog(n.)'.
bd3e41
-	
bd3e41
-	If ReadableRepresentations is false, return a machine-readable
bd3e41
-	representation, e.g. "getSynset(pos, 1234)".
bd3e41
-	"""
bd3e41
-	if ReadableRepresentations:
bd3e41
-	    return str(self)
bd3e41
-	return "getSynset" + `(self.pos, self.offset)`
bd3e41
+        """If ReadableRepresentations is true, return a human-readable
bd3e41
+        representation, e.g. 'dog(n.)'.
bd3e41
+        
bd3e41
+        If ReadableRepresentations is false, return a machine-readable
bd3e41
+        representation, e.g. "getSynset(pos, 1234)".
bd3e41
+        """
bd3e41
+        if ReadableRepresentations:
bd3e41
+            return str(self)
bd3e41
+        return "getSynset" + repr((self.pos, self.offset))
bd3e41
     
bd3e41
     def __cmp__(self, other):
bd3e41
-	return _compareInstances(self, other, ('pos', 'offset'))
bd3e41
+        return _compareInstances(self, other, ('pos', 'offset'))
bd3e41
     
bd3e41
     #
bd3e41
     # Sequence protocol (a Synset's elements are its senses).
bd3e41
     #
bd3e41
-    def __nonzero__(self):
bd3e41
-	return 1
bd3e41
+    def __bool__(self):
bd3e41
+        return 1
bd3e41
     
bd3e41
     def __len__(self):
bd3e41
-	"""
bd3e41
-	>>> len(N['dog'][0].synset)
bd3e41
-	3
bd3e41
-	"""
bd3e41
-	return len(self.getSenses())
bd3e41
+        """
bd3e41
+        >>> len(N['dog'][0].synset)
bd3e41
+        3
bd3e41
+        """
bd3e41
+        return len(self.getSenses())
bd3e41
     
bd3e41
     def __getitem__(self, idx):
bd3e41
-	"""
bd3e41
-	>>> N['dog'][0].synset[0] == N['dog'][0]
bd3e41
-	1
bd3e41
-	>>> N['dog'][0].synset['dog'] == N['dog'][0]
bd3e41
-	1
bd3e41
-	>>> N['dog'][0].synset[N['dog']] == N['dog'][0]
bd3e41
-	1
bd3e41
-	>>> N['cat'][6]
bd3e41
-	'cat' in {noun: big cat, cat}
bd3e41
-	"""
bd3e41
-	senses = self.getSenses()
bd3e41
-	if isinstance(idx, Word):
bd3e41
-	    idx = idx.form
bd3e41
-	if isinstance(idx, StringType):
bd3e41
-	    idx = _index(idx, map(lambda sense:sense.form, senses)) or \
bd3e41
-		  _index(idx, map(lambda sense:sense.form, senses), _equalsIgnoreCase)
bd3e41
-	return senses[idx]
bd3e41
+        """
bd3e41
+        >>> N['dog'][0].synset[0] == N['dog'][0]
bd3e41
+        1
bd3e41
+        >>> N['dog'][0].synset['dog'] == N['dog'][0]
bd3e41
+        1
bd3e41
+        >>> N['dog'][0].synset[N['dog']] == N['dog'][0]
bd3e41
+        1
bd3e41
+        >>> N['cat'][6]
bd3e41
+        'cat' in {noun: big cat, cat}
bd3e41
+        """
bd3e41
+        senses = self.getSenses()
bd3e41
+        if isinstance(idx, Word):
bd3e41
+            idx = idx.form
bd3e41
+        if isinstance(idx, str):
bd3e41
+            idx = _index(idx, [sense.form for sense in senses]) or \
bd3e41
+                  _index(idx, [sense.form for sense in senses], _equalsIgnoreCase)
bd3e41
+        return senses[idx]
bd3e41
     
bd3e41
     def __getslice__(self, i, j):
bd3e41
-	return self.getSenses()[i:j]
bd3e41
+        return self.getSenses()[i:j]
bd3e41
 
bd3e41
 
bd3e41
 class Sense:
bd3e41
@@ -527,7 +526,7 @@
bd3e41
           VERB_FRAME_STRINGS. These list the verb frames that this
bd3e41
           Sense partipates in.  Defined only for verbs.
bd3e41
 
bd3e41
-          >>> decide = V['decide'][0].synset	# first synset for 'decide'
bd3e41
+          >>> decide = V['decide'][0].synset        # first synset for 'decide'
bd3e41
           >>> decide[0].verbFrames
bd3e41
           (8, 2, 26, 29)
bd3e41
           >>> decide[1].verbFrames
bd3e41
@@ -538,124 +537,124 @@
bd3e41
     
bd3e41
     def __init__(sense, synset, senseTuple, verbFrames=None):
bd3e41
         "Initialize a sense from a synset's senseTuple."
bd3e41
-	# synset is stored by key (pos, synset) rather than object
bd3e41
-	# reference, to avoid creating a circular reference between
bd3e41
-	# Senses and Synsets that will prevent the vm from
bd3e41
-	# garbage-collecting them.
bd3e41
-	sense.pos = synset.pos
bd3e41
+        # synset is stored by key (pos, synset) rather than object
bd3e41
+        # reference, to avoid creating a circular reference between
bd3e41
+        # Senses and Synsets that will prevent the vm from
bd3e41
+        # garbage-collecting them.
bd3e41
+        sense.pos = synset.pos
bd3e41
         "part of speech -- one of NOUN, VERB, ADJECTIVE, ADVERB"
bd3e41
-	sense.synsetOffset = synset.offset
bd3e41
+        sense.synsetOffset = synset.offset
bd3e41
         "synset key.  This is used to retrieve the sense."
bd3e41
-	sense.verbFrames = verbFrames
bd3e41
+        sense.verbFrames = verbFrames
bd3e41
         """A sequence of integers that index into
bd3e41
         VERB_FRAME_STRINGS. These list the verb frames that this
bd3e41
         Sense partipates in.  Defined only for verbs."""
bd3e41
-	(form, idString) = senseTuple
bd3e41
-	sense.position = None
bd3e41
-	if '(' in form:
bd3e41
-	    index = string.index(form, '(')
bd3e41
-	    key = form[index + 1:-1]
bd3e41
-	    form = form[:index]
bd3e41
-	    if key == 'a':
bd3e41
-		sense.position = ATTRIBUTIVE
bd3e41
-	    elif key == 'p':
bd3e41
-		sense.position = PREDICATIVE
bd3e41
-	    elif key == 'ip':
bd3e41
-		sense.position = IMMEDIATE_POSTNOMINAL
bd3e41
-	    else:
bd3e41
-		raise "unknown attribute " + key
bd3e41
-	sense.form = string.replace(form, '_', ' ')
bd3e41
+        (form, idString) = senseTuple
bd3e41
+        sense.position = None
bd3e41
+        if '(' in form:
bd3e41
+            index = form.index('(')
bd3e41
+            key = form[index + 1:-1]
bd3e41
+            form = form[:index]
bd3e41
+            if key == 'a':
bd3e41
+                sense.position = ATTRIBUTIVE
bd3e41
+            elif key == 'p':
bd3e41
+                sense.position = PREDICATIVE
bd3e41
+            elif key == 'ip':
bd3e41
+                sense.position = IMMEDIATE_POSTNOMINAL
bd3e41
+            else:
bd3e41
+                raise "unknown attribute " + key
bd3e41
+        sense.form = form.replace('_', ' ')
bd3e41
         "orthographic representation of the Word this is a Sense of."
bd3e41
     
bd3e41
     def __getattr__(self, name):
bd3e41
-	# see the note at __init__ about why 'synset' is provided as a
bd3e41
-	# 'virtual' slot
bd3e41
-	if name == 'synset':
bd3e41
-	    return getSynset(self.pos, self.synsetOffset)
bd3e41
+        # see the note at __init__ about why 'synset' is provided as a
bd3e41
+        # 'virtual' slot
bd3e41
+        if name == 'synset':
bd3e41
+            return getSynset(self.pos, self.synsetOffset)
bd3e41
         elif name == 'lexname':
bd3e41
             return self.synset.lexname
bd3e41
-	else:
bd3e41
-	    raise AttributeError, name
bd3e41
+        else:
bd3e41
+            raise AttributeError(name)
bd3e41
     
bd3e41
     def __str__(self):
bd3e41
-	"""Return a human-readable representation.
bd3e41
-	
bd3e41
-	>>> str(N['dog'])
bd3e41
-	'dog(n.)'
bd3e41
-	"""
bd3e41
-	return `self.form` + " in " + str(self.synset)
bd3e41
+        """Return a human-readable representation.
bd3e41
+        
bd3e41
+        >>> str(N['dog'])
bd3e41
+        'dog(n.)'
bd3e41
+        """
bd3e41
+        return repr(self.form) + " in " + str(self.synset)
bd3e41
     
bd3e41
     def __repr__(self):
bd3e41
-	"""If ReadableRepresentations is true, return a human-readable
bd3e41
-	representation, e.g. 'dog(n.)'.
bd3e41
-	
bd3e41
-	If ReadableRepresentations is false, return a machine-readable
bd3e41
-	representation, e.g. "getWord('dog', 'noun')".
bd3e41
-	"""
bd3e41
-	if ReadableRepresentations:
bd3e41
-	    return str(self)
bd3e41
-	return "%s[%s]" % (`self.synset`, `self.form`)
bd3e41
+        """If ReadableRepresentations is true, return a human-readable
bd3e41
+        representation, e.g. 'dog(n.)'.
bd3e41
+        
bd3e41
+        If ReadableRepresentations is false, return a machine-readable
bd3e41
+        representation, e.g. "getWord('dog', 'noun')".
bd3e41
+        """
bd3e41
+        if ReadableRepresentations:
bd3e41
+            return str(self)
bd3e41
+        return "%s[%s]" % (repr(self.synset), repr(self.form))
bd3e41
     
bd3e41
     def getPointers(self, pointerType=None):
bd3e41
-	"""Return a sequence of Pointers.
bd3e41
-	
bd3e41
+        """Return a sequence of Pointers.
bd3e41
+        
bd3e41
         If pointerType is specified, only pointers of that type are
bd3e41
         returned.  In this case, pointerType should be an element of
bd3e41
         POINTER_TYPES.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].getPointers()[:5]
bd3e41
-	(hypernym -> {noun: canine, canid}, member meronym -> {noun: Canis, genus Canis}, member meronym -> {noun: pack}, hyponym -> {noun: pooch, doggie, doggy, barker, bow-wow}, hyponym -> {noun: cur, mongrel, mutt})
bd3e41
-	>>> N['dog'][0].getPointers(HYPERNYM)
bd3e41
-	(hypernym -> {noun: canine, canid},)
bd3e41
-	"""
bd3e41
-	senseIndex = _index(self, self.synset.getSenses())
bd3e41
-	def pointsFromThisSense(pointer, selfIndex=senseIndex):
bd3e41
-	    return pointer.sourceIndex == 0 or pointer.sourceIndex - 1 == selfIndex
bd3e41
-	return filter(pointsFromThisSense, self.synset.getPointers(pointerType))
bd3e41
+        
bd3e41
+        >>> N['dog'][0].getPointers()[:5]
bd3e41
+        (hypernym -> {noun: canine, canid}, member meronym -> {noun: Canis, genus Canis}, member meronym -> {noun: pack}, hyponym -> {noun: pooch, doggie, doggy, barker, bow-wow}, hyponym -> {noun: cur, mongrel, mutt})
bd3e41
+        >>> N['dog'][0].getPointers(HYPERNYM)
bd3e41
+        (hypernym -> {noun: canine, canid},)
bd3e41
+        """
bd3e41
+        senseIndex = _index(self, self.synset.getSenses())
bd3e41
+        def pointsFromThisSense(pointer, selfIndex=senseIndex):
bd3e41
+            return pointer.sourceIndex == 0 or pointer.sourceIndex - 1 == selfIndex
bd3e41
+        return list(filter(pointsFromThisSense, self.synset.getPointers(pointerType)))
bd3e41
 
bd3e41
     pointers = getPointers # backwards compatability
bd3e41
 
bd3e41
     def getPointerTargets(self, pointerType=None):
bd3e41
-	"""Return a sequence of Senses or Synsets.
bd3e41
-	
bd3e41
+        """Return a sequence of Senses or Synsets.
bd3e41
+        
bd3e41
         If pointerType is specified, only targets of pointers of that
bd3e41
         type are returned.  In this case, pointerType should be an
bd3e41
         element of POINTER_TYPES.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].getPointerTargets()[:5]
bd3e41
-	[{noun: canine, canid}, {noun: Canis, genus Canis}, {noun: pack}, {noun: pooch, doggie, doggy, barker, bow-wow}, {noun: cur, mongrel, mutt}]
bd3e41
-	>>> N['dog'][0].getPointerTargets(HYPERNYM)
bd3e41
-	[{noun: canine, canid}]
bd3e41
-	"""
bd3e41
-	return map(Pointer.target, self.getPointers(pointerType))
bd3e41
+        
bd3e41
+        >>> N['dog'][0].getPointerTargets()[:5]
bd3e41
+        [{noun: canine, canid}, {noun: Canis, genus Canis}, {noun: pack}, {noun: pooch, doggie, doggy, barker, bow-wow}, {noun: cur, mongrel, mutt}]
bd3e41
+        >>> N['dog'][0].getPointerTargets(HYPERNYM)
bd3e41
+        [{noun: canine, canid}]
bd3e41
+        """
bd3e41
+        return list(map(Pointer.target, self.getPointers(pointerType)))
bd3e41
 
bd3e41
     pointerTargets = getPointerTargets # backwards compatability
bd3e41
     
bd3e41
     def getSenses(self):
bd3e41
-	return self,
bd3e41
+        return self,
bd3e41
 
bd3e41
     senses = getSenses # backwards compatability
bd3e41
 
bd3e41
     def isTagged(self):
bd3e41
-	"""Return 1 if any sense is tagged.
bd3e41
-	
bd3e41
-	>>> N['dog'][0].isTagged()
bd3e41
-	1
bd3e41
-	>>> N['dog'][1].isTagged()
bd3e41
-	0
bd3e41
-	"""
bd3e41
-	word = self.word()
bd3e41
-	return _index(self, word.getSenses()) < word.taggedSenseCount
bd3e41
+        """Return 1 if any sense is tagged.
bd3e41
+        
bd3e41
+        >>> N['dog'][0].isTagged()
bd3e41
+        1
bd3e41
+        >>> N['dog'][1].isTagged()
bd3e41
+        0
bd3e41
+        """
bd3e41
+        word = self.word()
bd3e41
+        return _index(self, word.getSenses()) < word.taggedSenseCount
bd3e41
     
bd3e41
     def getWord(self):
bd3e41
-	return getWord(self.form, self.pos)
bd3e41
+        return getWord(self.form, self.pos)
bd3e41
 
bd3e41
     word = getWord # backwards compatability
bd3e41
 
bd3e41
     def __cmp__(self, other):
bd3e41
-	def senseIndex(sense, synset=self.synset):
bd3e41
-	    return _index(sense, synset.getSenses(), testfn=lambda a,b: a.form == b.form)
bd3e41
-	return _compareInstances(self, other, ('synset',)) or cmp(senseIndex(self), senseIndex(other))
bd3e41
+        def senseIndex(sense, synset=self.synset):
bd3e41
+            return _index(sense, synset.getSenses(), testfn=lambda a,b: a.form == b.form)
bd3e41
+        return _compareInstances(self, other, ('synset',)) or cmp(senseIndex(self), senseIndex(other))
bd3e41
 
bd3e41
 
bd3e41
 class Pointer:
bd3e41
@@ -670,21 +669,21 @@
bd3e41
     """
bd3e41
     
bd3e41
     _POINTER_TYPE_TABLE = {
bd3e41
-	'!': ANTONYM,
bd3e41
+        '!': ANTONYM,
bd3e41
         '@': HYPERNYM,
bd3e41
         '~': HYPONYM,
bd3e41
-	'=': ATTRIBUTE,
bd3e41
+        '=': ATTRIBUTE,
bd3e41
         '^': ALSO_SEE,
bd3e41
         '*': ENTAILMENT,
bd3e41
         '>': CAUSE,
bd3e41
-	'$': VERB_GROUP,
bd3e41
-	'#m': MEMBER_MERONYM,
bd3e41
+        '$': VERB_GROUP,
bd3e41
+        '#m': MEMBER_MERONYM,
bd3e41
         '#s': SUBSTANCE_MERONYM,
bd3e41
         '#p': PART_MERONYM,
bd3e41
-	'%m': MEMBER_HOLONYM,
bd3e41
+        '%m': MEMBER_HOLONYM,
bd3e41
         '%s': SUBSTANCE_HOLONYM,
bd3e41
         '%p': PART_HOLONYM,
bd3e41
-	'&': SIMILAR,
bd3e41
+        '&': SIMILAR,
bd3e41
         '<': PARTICIPLE_OF,
bd3e41
         '\\': PERTAINYM,
bd3e41
         # New in wn 2.0:
bd3e41
@@ -698,57 +697,57 @@
bd3e41
         }
bd3e41
     
bd3e41
     def __init__(self, sourceOffset, pointerTuple):
bd3e41
-	(type, offset, pos, indices) = pointerTuple
bd3e41
-	# dnaber: try to adapt to WordNet 2.1:
bd3e41
-	if type == "@i":
bd3e41
-		type = "@"
bd3e41
-	if type == "~i":
bd3e41
-		type = "~"
bd3e41
-	# /dnaber
bd3e41
-	self.type = Pointer._POINTER_TYPE_TABLE[type]
bd3e41
+        (type, offset, pos, indices) = pointerTuple
bd3e41
+        # dnaber: try to adapt to WordNet 2.1:
bd3e41
+        if type == "@i":
bd3e41
+                type = "@"
bd3e41
+        if type == "~i":
bd3e41
+                type = "~"
bd3e41
+        # /dnaber
bd3e41
+        self.type = Pointer._POINTER_TYPE_TABLE[type]
bd3e41
         """One of POINTER_TYPES."""
bd3e41
-	self.sourceOffset = sourceOffset
bd3e41
-	self.targetOffset = int(offset)
bd3e41
-	self.pos = _normalizePOS(pos)
bd3e41
+        self.sourceOffset = sourceOffset
bd3e41
+        self.targetOffset = int(offset)
bd3e41
+        self.pos = _normalizePOS(pos)
bd3e41
         """part of speech -- one of NOUN, VERB, ADJECTIVE, ADVERB"""
bd3e41
-	indices = string.atoi(indices, 16)
bd3e41
-	self.sourceIndex = indices >> 8
bd3e41
-	self.targetIndex = indices & 255
bd3e41
+        indices = int(indices, 16)
bd3e41
+        self.sourceIndex = indices >> 8
bd3e41
+        self.targetIndex = indices & 255
bd3e41
     
bd3e41
     def getSource(self):
bd3e41
-	synset = getSynset(self.pos, self.sourceOffset)
bd3e41
-	if self.sourceIndex:
bd3e41
-	    return synset[self.sourceIndex - 1]
bd3e41
-	else:
bd3e41
-	    return synset
bd3e41
+        synset = getSynset(self.pos, self.sourceOffset)
bd3e41
+        if self.sourceIndex:
bd3e41
+            return synset[self.sourceIndex - 1]
bd3e41
+        else:
bd3e41
+            return synset
bd3e41
 
bd3e41
     source = getSource # backwards compatability
bd3e41
 
bd3e41
     def getTarget(self):
bd3e41
-	synset = getSynset(self.pos, self.targetOffset)
bd3e41
-	if self.targetIndex:
bd3e41
-	    return synset[self.targetIndex - 1]
bd3e41
-	else:
bd3e41
-	    return synset
bd3e41
+        synset = getSynset(self.pos, self.targetOffset)
bd3e41
+        if self.targetIndex:
bd3e41
+            return synset[self.targetIndex - 1]
bd3e41
+        else:
bd3e41
+            return synset
bd3e41
 
bd3e41
     target = getTarget # backwards compatability
bd3e41
     
bd3e41
     def __str__(self):
bd3e41
-	return self.type + " -> " + str(self.target())
bd3e41
+        return self.type + " -> " + str(self.target())
bd3e41
     
bd3e41
     def __repr__(self):
bd3e41
-	if ReadableRepresentations:
bd3e41
-	    return str(self)
bd3e41
-	return "<" + str(self) + ">"
bd3e41
+        if ReadableRepresentations:
bd3e41
+            return str(self)
bd3e41
+        return "<" + str(self) + ">"
bd3e41
     
bd3e41
     def __cmp__(self, other):
bd3e41
-	diff = _compareInstances(self, other, ('pos', 'sourceOffset'))
bd3e41
-	if diff:
bd3e41
-	    return diff
bd3e41
-	synset = self.source()
bd3e41
-	def pointerIndex(sense, synset=synset):
bd3e41
-	    return _index(sense, synset.getPointers(), testfn=lambda a,b: not _compareInstances(a, b, ('type', 'sourceIndex', 'targetIndex')))
bd3e41
-	return cmp(pointerIndex(self), pointerIndex(other))
bd3e41
+        diff = _compareInstances(self, other, ('pos', 'sourceOffset'))
bd3e41
+        if diff:
bd3e41
+            return diff
bd3e41
+        synset = self.source()
bd3e41
+        def pointerIndex(sense, synset=synset):
bd3e41
+            return _index(sense, synset.getPointers(), testfn=lambda a,b: not _compareInstances(a, b, ('type', 'sourceIndex', 'targetIndex')))
bd3e41
+        return cmp(pointerIndex(self), pointerIndex(other))
bd3e41
 
bd3e41
 
bd3e41
 # Loading the lexnames
bd3e41
@@ -769,7 +768,7 @@
bd3e41
 
bd3e41
 def setupLexnames():
bd3e41
     for l in open(WNSEARCHDIR+'/lexnames').readlines():
bd3e41
-        i,name,category = string.split(l)
bd3e41
+        i,name,category = l.split()
bd3e41
         Lexname(name,PartsOfSpeech[int(category)-1])
bd3e41
 
bd3e41
 setupLexnames()
bd3e41
@@ -802,59 +801,59 @@
bd3e41
     """
bd3e41
     
bd3e41
     def __init__(self, pos, filenameroot):
bd3e41
-	self.pos = pos
bd3e41
+        self.pos = pos
bd3e41
         """part of speech -- one of NOUN, VERB, ADJECTIVE, ADVERB"""
bd3e41
-	self.indexFile = _IndexFile(pos, filenameroot)
bd3e41
-	self.dataFile = open(_dataFilePathname(filenameroot), _FILE_OPEN_MODE)
bd3e41
+        self.indexFile = _IndexFile(pos, filenameroot)
bd3e41
+        self.dataFile = open(_dataFilePathname(filenameroot), _FILE_OPEN_MODE)
bd3e41
     
bd3e41
     def __repr__(self):
bd3e41
-	dictionaryVariables = {N: 'N', V: 'V', ADJ: 'ADJ', ADV: 'ADV'}
bd3e41
-	if dictionaryVariables.get(self):
bd3e41
-	    return self.__module__ + "." + dictionaryVariables[self]
bd3e41
-	return "<%s.%s instance for %s>" % (self.__module__, "Dictionary", self.pos)
bd3e41
+        dictionaryVariables = {N: 'N', V: 'V', ADJ: 'ADJ', ADV: 'ADV'}
bd3e41
+        if dictionaryVariables.get(self):
bd3e41
+            return self.__module__ + "." + dictionaryVariables[self]
bd3e41
+        return "<%s.%s instance for %s>" % (self.__module__, "Dictionary", self.pos)
bd3e41
     
bd3e41
     def getWord(self, form, line=None):
bd3e41
-	key = string.replace(string.lower(form), ' ', '_')
bd3e41
-	pos = self.pos
bd3e41
-	def loader(key=key, line=line, indexFile=self.indexFile):
bd3e41
-	    line = line or indexFile.get(key)
bd3e41
-	    return line and Word(line)
bd3e41
-	word = _entityCache.get((pos, key), loader)
bd3e41
-	if word:
bd3e41
-	    return word
bd3e41
-	else:
bd3e41
-	    raise KeyError, "%s is not in the %s database" % (`form`, `pos`)
bd3e41
+        key = form.lower().replace(' ', '_')
bd3e41
+        pos = self.pos
bd3e41
+        def loader(key=key, line=line, indexFile=self.indexFile):
bd3e41
+            line = line or indexFile.get(key)
bd3e41
+            return line and Word(line)
bd3e41
+        word = _entityCache.get((pos, key), loader)
bd3e41
+        if word != None:
bd3e41
+            return word
bd3e41
+        else:
bd3e41
+            raise KeyError("%s is not in the %s database" % (repr(form), repr(pos)))
bd3e41
     
bd3e41
     def getSynset(self, offset):
bd3e41
-	pos = self.pos
bd3e41
-	def loader(pos=pos, offset=offset, dataFile=self.dataFile):
bd3e41
-	    return Synset(pos, offset, _lineAt(dataFile, offset))
bd3e41
-	return _entityCache.get((pos, offset), loader)
bd3e41
+        pos = self.pos
bd3e41
+        def loader(pos=pos, offset=offset, dataFile=self.dataFile):
bd3e41
+            return Synset(pos, offset, _lineAt(dataFile, offset))
bd3e41
+        return _entityCache.get((pos, offset), loader)
bd3e41
     
bd3e41
     def _buildIndexCacheFile(self):
bd3e41
-	self.indexFile._buildIndexCacheFile()
bd3e41
+        self.indexFile._buildIndexCacheFile()
bd3e41
     
bd3e41
     #
bd3e41
     # Sequence protocol (a Dictionary's items are its Words)
bd3e41
     #
bd3e41
-    def __nonzero__(self):
bd3e41
-	"""Return false.  (This is to avoid scanning the whole index file
bd3e41
-	to compute len when a Dictionary is used in test position.)
bd3e41
-	
bd3e41
-	>>> N and 'true'
bd3e41
-	'true'
bd3e41
-	"""
bd3e41
-	return 1
bd3e41
+    def __bool__(self):
bd3e41
+        """Return false.  (This is to avoid scanning the whole index file
bd3e41
+        to compute len when a Dictionary is used in test position.)
bd3e41
+        
bd3e41
+        >>> N and 'true'
bd3e41
+        'true'
bd3e41
+        """
bd3e41
+        return 1
bd3e41
     
bd3e41
     def __len__(self):
bd3e41
-	"""Return the number of index entries.
bd3e41
-	
bd3e41
-	>>> len(ADJ)
bd3e41
-	21435
bd3e41
-	"""
bd3e41
-	if not hasattr(self, 'length'):
bd3e41
-	    self.length = len(self.indexFile)
bd3e41
-	return self.length
bd3e41
+        """Return the number of index entries.
bd3e41
+        
bd3e41
+        >>> len(ADJ)
bd3e41
+        21435
bd3e41
+        """
bd3e41
+        if not hasattr(self, 'length'):
bd3e41
+            self.length = len(self.indexFile)
bd3e41
+        return self.length
bd3e41
     
bd3e41
     def __getslice__(self, a, b):
bd3e41
         results = []
bd3e41
@@ -868,22 +867,22 @@
bd3e41
         return results
bd3e41
 
bd3e41
     def __getitem__(self, index):
bd3e41
-	"""If index is a String, return the Word whose form is
bd3e41
-	index.  If index is an integer n, return the Word
bd3e41
-	indexed by the n'th Word in the Index file.
bd3e41
-	
bd3e41
-	>>> N['dog']
bd3e41
-	dog(n.)
bd3e41
-	>>> N[0]
bd3e41
-	'hood(n.)
bd3e41
-	"""
bd3e41
-	if isinstance(index, StringType):
bd3e41
-	    return self.getWord(index)
bd3e41
-	elif isinstance(index, IntType):
bd3e41
-	    line = self.indexFile[index]
bd3e41
-	    return self.getWord(string.replace(line[:string.find(line, ' ')], '_', ' '), line)
bd3e41
-	else:
bd3e41
-	    raise TypeError, "%s is not a String or Int" % `index`
bd3e41
+        """If index is a String, return the Word whose form is
bd3e41
+        index.  If index is an integer n, return the Word
bd3e41
+        indexed by the n'th Word in the Index file.
bd3e41
+        
bd3e41
+        >>> N['dog']
bd3e41
+        dog(n.)
bd3e41
+        >>> N[0]
bd3e41
+        'hood(n.)
bd3e41
+        """
bd3e41
+        if isinstance(index, str):
bd3e41
+            return self.getWord(index)
bd3e41
+        elif isinstance(index, int):
bd3e41
+            line = self.indexFile[index]
bd3e41
+            return self.getWord(string.replace(line[:string.find(line, ' ')], '_', ' '), line)
bd3e41
+        else:
bd3e41
+            raise TypeError("%s is not a String or Int" % repr(index))
bd3e41
     
bd3e41
     #
bd3e41
     # Dictionary protocol
bd3e41
@@ -892,54 +891,54 @@
bd3e41
     #
bd3e41
 
bd3e41
     def get(self, key, default=None):
bd3e41
-	"""Return the Word whose form is _key_, or _default_.
bd3e41
-	
bd3e41
-	>>> N.get('dog')
bd3e41
-	dog(n.)
bd3e41
-	>>> N.get('inu')
bd3e41
-	"""
bd3e41
-	try:
bd3e41
-	    return self[key]
bd3e41
-	except LookupError:
bd3e41
-	    return default
bd3e41
+        """Return the Word whose form is _key_, or _default_.
bd3e41
+        
bd3e41
+        >>> N.get('dog')
bd3e41
+        dog(n.)
bd3e41
+        >>> N.get('inu')
bd3e41
+        """
bd3e41
+        try:
bd3e41
+            return self[key]
bd3e41
+        except LookupError:
bd3e41
+            return default
bd3e41
     
bd3e41
     def keys(self):
bd3e41
-	"""Return a sorted list of strings that index words in this
bd3e41
-	dictionary."""
bd3e41
-	return self.indexFile.keys()
bd3e41
+        """Return a sorted list of strings that index words in this
bd3e41
+        dictionary."""
bd3e41
+        return list(self.indexFile.keys())
bd3e41
     
bd3e41
     def has_key(self, form):
bd3e41
-	"""Return true iff the argument indexes a word in this dictionary.
bd3e41
-	
bd3e41
-	>>> N.has_key('dog')
bd3e41
-	1
bd3e41
-	>>> N.has_key('inu')
bd3e41
-	0
bd3e41
-	"""
bd3e41
-	return self.indexFile.has_key(form)
bd3e41
+        """Return true iff the argument indexes a word in this dictionary.
bd3e41
+        
bd3e41
+        >>> N.has_key('dog')
bd3e41
+        1
bd3e41
+        >>> N.has_key('inu')
bd3e41
+        0
bd3e41
+        """
bd3e41
+        return form in self.indexFile
bd3e41
     
bd3e41
     #
bd3e41
     # Testing
bd3e41
     #
bd3e41
     
bd3e41
     def _testKeys(self):
bd3e41
-	"""Verify that index lookup can find each word in the index file."""
bd3e41
-	print "Testing: ", self
bd3e41
-	file = open(self.indexFile.file.name, _FILE_OPEN_MODE)
bd3e41
-	counter = 0
bd3e41
-	while 1:
bd3e41
-	    line = file.readline()
bd3e41
-	    if line == '': break
bd3e41
-	    if line[0] != ' ':
bd3e41
-		key = string.replace(line[:string.find(line, ' ')], '_', ' ')
bd3e41
-		if (counter % 1000) == 0:
bd3e41
-		    print "%s..." % (key,),
bd3e41
-		    import sys
bd3e41
-		    sys.stdout.flush()
bd3e41
-		counter = counter + 1
bd3e41
-		self[key]
bd3e41
-	file.close()
bd3e41
-	print "done."
bd3e41
+        """Verify that index lookup can find each word in the index file."""
bd3e41
+        print("Testing: ", self)
bd3e41
+        file = open(self.indexFile.file.name, _FILE_OPEN_MODE)
bd3e41
+        counter = 0
bd3e41
+        while 1:
bd3e41
+            line = file.readline()
bd3e41
+            if line == '': break
bd3e41
+            if line[0] != ' ':
bd3e41
+                key = string.replace(line[:string.find(line, ' ')], '_', ' ')
bd3e41
+                if (counter % 1000) == 0:
bd3e41
+                    print("%s..." % (key,), end=' ')
bd3e41
+                    import sys
bd3e41
+                    sys.stdout.flush()
bd3e41
+                counter = counter + 1
bd3e41
+                self[key]
bd3e41
+        file.close()
bd3e41
+        print("done.")
bd3e41
 
bd3e41
 
bd3e41
 class _IndexFile:
bd3e41
@@ -947,69 +946,69 @@
bd3e41
     Sequence and Dictionary interface to a sorted index file."""
bd3e41
     
bd3e41
     def __init__(self, pos, filenameroot):
bd3e41
-	self.pos = pos
bd3e41
-	self.file = open(_indexFilePathname(filenameroot), _FILE_OPEN_MODE)
bd3e41
-	self.offsetLineCache = {}   # Table of (pathname, offset) -> (line, nextOffset)
bd3e41
-	self.rewind()
bd3e41
-	self.shelfname = os.path.join(WNSEARCHDIR, pos + ".pyidx")
bd3e41
-	try:
bd3e41
-	    import shelve
bd3e41
-	    self.indexCache = shelve.open(self.shelfname, 'r')
bd3e41
-	except:
bd3e41
-	    pass
bd3e41
+        self.pos = pos
bd3e41
+        self.file = open(_indexFilePathname(filenameroot), _FILE_OPEN_MODE)
bd3e41
+        self.offsetLineCache = {}   # Table of (pathname, offset) -> (line, nextOffset)
bd3e41
+        self.rewind()
bd3e41
+        self.shelfname = os.path.join(WNSEARCHDIR, pos + ".pyidx")
bd3e41
+        try:
bd3e41
+            import shelve
bd3e41
+            self.indexCache = shelve.open(self.shelfname, 'r')
bd3e41
+        except:
bd3e41
+            pass
bd3e41
     
bd3e41
     def rewind(self):
bd3e41
-	self.file.seek(0)
bd3e41
-	while 1:
bd3e41
-	    offset = self.file.tell()
bd3e41
-	    line = self.file.readline()
bd3e41
-	    if (line[0] != ' '):
bd3e41
-		break
bd3e41
-	self.nextIndex = 0
bd3e41
-	self.nextOffset = offset
bd3e41
+        self.file.seek(0)
bd3e41
+        while 1:
bd3e41
+            offset = self.file.tell()
bd3e41
+            line = self.file.readline()
bd3e41
+            if (line[0] != ' '):
bd3e41
+                break
bd3e41
+        self.nextIndex = 0
bd3e41
+        self.nextOffset = offset
bd3e41
     
bd3e41
     #
bd3e41
     # Sequence protocol (an _IndexFile's items are its lines)
bd3e41
     #
bd3e41
-    def __nonzero__(self):
bd3e41
-	return 1
bd3e41
+    def __bool__(self):
bd3e41
+        return 1
bd3e41
     
bd3e41
     def __len__(self):
bd3e41
-	if hasattr(self, 'indexCache'):
bd3e41
-	    return len(self.indexCache)
bd3e41
-	self.rewind()
bd3e41
-	lines = 0
bd3e41
-	while 1:
bd3e41
-	    line = self.file.readline()
bd3e41
-	    if line == "":
bd3e41
-		break
bd3e41
-	    lines = lines + 1
bd3e41
-	return lines
bd3e41
+        if hasattr(self, 'indexCache'):
bd3e41
+            return len(self.indexCache)
bd3e41
+        self.rewind()
bd3e41
+        lines = 0
bd3e41
+        while 1:
bd3e41
+            line = self.file.readline()
bd3e41
+            if line == "":
bd3e41
+                break
bd3e41
+            lines = lines + 1
bd3e41
+        return lines
bd3e41
     
bd3e41
-    def __nonzero__(self):
bd3e41
-	return 1
bd3e41
+    def __bool__(self):
bd3e41
+        return 1
bd3e41
     
bd3e41
     def __getitem__(self, index):
bd3e41
-	if isinstance(index, StringType):
bd3e41
-	    if hasattr(self, 'indexCache'):
bd3e41
-		return self.indexCache[index]
bd3e41
-	    return binarySearchFile(self.file, index, self.offsetLineCache, 8)
bd3e41
-	elif isinstance(index, IntType):
bd3e41
-	    if hasattr(self, 'indexCache'):
bd3e41
-		return self.get(self.keys[index])
bd3e41
-	    if index < self.nextIndex:
bd3e41
-		self.rewind()
bd3e41
-	    while self.nextIndex <= index:
bd3e41
-		self.file.seek(self.nextOffset)
bd3e41
-		line = self.file.readline()
bd3e41
-		if line == "":
bd3e41
-		    raise IndexError, "index out of range"
bd3e41
-		self.nextIndex = self.nextIndex + 1
bd3e41
-		self.nextOffset = self.file.tell()
bd3e41
-	    return line
bd3e41
-	else:
bd3e41
-	    raise TypeError, "%s is not a String or Int" % `index`
bd3e41
-	
bd3e41
+        if isinstance(index, str):
bd3e41
+            if hasattr(self, 'indexCache'):
bd3e41
+                return self.indexCache[index]
bd3e41
+            return binarySearchFile(self.file, index, self.offsetLineCache, 8)
bd3e41
+        elif isinstance(index, int):
bd3e41
+            if hasattr(self, 'indexCache'):
bd3e41
+                return self.get(self.keys[index])
bd3e41
+            if index < self.nextIndex:
bd3e41
+                self.rewind()
bd3e41
+            while self.nextIndex <= index:
bd3e41
+                self.file.seek(self.nextOffset)
bd3e41
+                line = self.file.readline()
bd3e41
+                if line == "":
bd3e41
+                    raise IndexError("index out of range")
bd3e41
+                self.nextIndex = self.nextIndex + 1
bd3e41
+                self.nextOffset = self.file.tell()
bd3e41
+            return line
bd3e41
+        else:
bd3e41
+            raise TypeError("%s is not a String or Int" % repr(index))
bd3e41
+        
bd3e41
     #
bd3e41
     # Dictionary protocol
bd3e41
     #
bd3e41
@@ -1017,62 +1016,62 @@
bd3e41
     #
bd3e41
     
bd3e41
     def get(self, key, default=None):
bd3e41
-	try:
bd3e41
-	    return self[key]
bd3e41
-	except LookupError:
bd3e41
-	    return default
bd3e41
+        try:
bd3e41
+            return self[key]
bd3e41
+        except LookupError:
bd3e41
+            return default
bd3e41
     
bd3e41
     def keys(self):
bd3e41
-	if hasattr(self, 'indexCache'):
bd3e41
-	    keys = self.indexCache.keys()
bd3e41
-	    keys.sort()
bd3e41
-	    return keys
bd3e41
-	else:
bd3e41
-	    keys = []
bd3e41
-	    self.rewind()
bd3e41
-	    while 1:
bd3e41
-		line = self.file.readline()
bd3e41
-		if not line: break
bd3e41
+        if hasattr(self, 'indexCache'):
bd3e41
+            keys = list(self.indexCache.keys())
bd3e41
+            keys.sort()
bd3e41
+            return keys
bd3e41
+        else:
bd3e41
+            keys = []
bd3e41
+            self.rewind()
bd3e41
+            while 1:
bd3e41
+                line = self.file.readline()
bd3e41
+                if not line: break
bd3e41
                 key = line.split(' ', 1)[0]
bd3e41
-		keys.append(key.replace('_', ' '))
bd3e41
-	    return keys
bd3e41
+                keys.append(key.replace('_', ' '))
bd3e41
+            return keys
bd3e41
     
bd3e41
     def has_key(self, key):
bd3e41
-	key = key.replace(' ', '_') # test case: V['haze over']
bd3e41
-	if hasattr(self, 'indexCache'):
bd3e41
-	    return self.indexCache.has_key(key)
bd3e41
-	return self.get(key) != None
bd3e41
+        key = key.replace(' ', '_') # test case: V['haze over']
bd3e41
+        if hasattr(self, 'indexCache'):
bd3e41
+            return key in self.indexCache
bd3e41
+        return self.get(key) != None
bd3e41
     
bd3e41
     #
bd3e41
     # Index file
bd3e41
     #
bd3e41
     
bd3e41
     def _buildIndexCacheFile(self):
bd3e41
-	import shelve
bd3e41
-	import os
bd3e41
-	print "Building %s:" % (self.shelfname,),
bd3e41
-	tempname = self.shelfname + ".temp"
bd3e41
-	try:
bd3e41
-	    indexCache = shelve.open(tempname)
bd3e41
-	    self.rewind()
bd3e41
-	    count = 0
bd3e41
-	    while 1:
bd3e41
-		offset, line = self.file.tell(), self.file.readline()
bd3e41
-		if not line: break
bd3e41
-		key = line[:string.find(line, ' ')]
bd3e41
-		if (count % 1000) == 0:
bd3e41
-		    print "%s..." % (key,),
bd3e41
-		    import sys
bd3e41
-		    sys.stdout.flush()
bd3e41
-		indexCache[key] = line
bd3e41
-		count = count + 1
bd3e41
-	    indexCache.close()
bd3e41
-	    os.rename(tempname, self.shelfname)
bd3e41
-	finally:
bd3e41
-	    try: os.remove(tempname)
bd3e41
-	    except: pass
bd3e41
-	print "done."
bd3e41
-	self.indexCache = shelve.open(self.shelfname, 'r')
bd3e41
+        import shelve
bd3e41
+        import os
bd3e41
+        print("Building %s:" % (self.shelfname,), end=' ')
bd3e41
+        tempname = self.shelfname + ".temp"
bd3e41
+        try:
bd3e41
+            indexCache = shelve.open(tempname)
bd3e41
+            self.rewind()
bd3e41
+            count = 0
bd3e41
+            while 1:
bd3e41
+                offset, line = self.file.tell(), self.file.readline()
bd3e41
+                if not line: break
bd3e41
+                key = line[:string.find(line, ' ')]
bd3e41
+                if (count % 1000) == 0:
bd3e41
+                    print("%s..." % (key,), end=' ')
bd3e41
+                    import sys
bd3e41
+                    sys.stdout.flush()
bd3e41
+                indexCache[key] = line
bd3e41
+                count = count + 1
bd3e41
+            indexCache.close()
bd3e41
+            os.rename(tempname, self.shelfname)
bd3e41
+        finally:
bd3e41
+            try: os.remove(tempname)
bd3e41
+            except: pass
bd3e41
+        print("done.")
bd3e41
+        self.indexCache = shelve.open(self.shelfname, 'r')
bd3e41
 
bd3e41
 
bd3e41
 #
bd3e41
@@ -1099,20 +1098,20 @@
bd3e41
 
bd3e41
 def _requirePointerType(pointerType):
bd3e41
     if pointerType not in POINTER_TYPES:
bd3e41
-	raise TypeError, `pointerType` + " is not a pointer type"
bd3e41
+        raise TypeError(repr(pointerType) + " is not a pointer type")
bd3e41
     return pointerType
bd3e41
 
bd3e41
 def _compareInstances(a, b, fields):
bd3e41
     """"Return -1, 0, or 1 according to a comparison first by type,
bd3e41
     then by class, and finally by each of fields.""" # " <- for emacs
bd3e41
     if not hasattr(b, '__class__'):
bd3e41
-	return cmp(type(a), type(b))
bd3e41
+        return cmp(type(a), type(b))
bd3e41
     elif a.__class__ != b.__class__:
bd3e41
-	return cmp(a.__class__, b.__class__)
bd3e41
+        return cmp(a.__class__, b.__class__)
bd3e41
     for field in fields:
bd3e41
-	diff = cmp(getattr(a, field), getattr(b, field))
bd3e41
-	if diff:
bd3e41
-	    return diff
bd3e41
+        diff = cmp(getattr(a, field), getattr(b, field))
bd3e41
+        if diff:
bd3e41
+            return diff
bd3e41
     return 0
bd3e41
 
bd3e41
 def _equalsIgnoreCase(a, b):
bd3e41
@@ -1123,21 +1122,21 @@
bd3e41
     >>> _equalsIgnoreCase('dOg', 'DOG')
bd3e41
     1
bd3e41
     """
bd3e41
-    return a == b or string.lower(a) == string.lower(b)
bd3e41
+    return a == b or a.lower() == b.lower()
bd3e41
 
bd3e41
 #
bd3e41
 # File utilities
bd3e41
 #
bd3e41
 def _dataFilePathname(filenameroot):
bd3e41
     if os.name in ('dos', 'nt'):
bd3e41
-	path = os.path.join(WNSEARCHDIR, filenameroot + ".dat")
bd3e41
+        path = os.path.join(WNSEARCHDIR, filenameroot + ".dat")
bd3e41
         if os.path.exists(path):
bd3e41
             return path
bd3e41
     return os.path.join(WNSEARCHDIR, "data." + filenameroot)
bd3e41
 
bd3e41
 def _indexFilePathname(filenameroot):
bd3e41
     if os.name in ('dos', 'nt'):
bd3e41
-	path = os.path.join(WNSEARCHDIR, filenameroot + ".idx")
bd3e41
+        path = os.path.join(WNSEARCHDIR, filenameroot + ".idx")
bd3e41
         if os.path.exists(path):
bd3e41
             return path
bd3e41
     return os.path.join(WNSEARCHDIR, "index." + filenameroot)
bd3e41
@@ -1154,30 +1153,30 @@
bd3e41
         #if count > 20:
bd3e41
         #    raise "infinite loop"
bd3e41
         lastState = start, end
bd3e41
-	middle = (start + end) / 2
bd3e41
-	if cache.get(middle):
bd3e41
-	    offset, line = cache[middle]
bd3e41
-	else:
bd3e41
-	    file.seek(max(0, middle - 1))
bd3e41
-	    if middle > 0:
bd3e41
-		file.readline()
bd3e41
-	    offset, line = file.tell(), file.readline()
bd3e41
-	    if currentDepth < cacheDepth:
bd3e41
-		cache[middle] = (offset, line)
bd3e41
+        middle = (start + end) / 2
bd3e41
+        if cache.get(middle):
bd3e41
+            offset, line = cache[middle]
bd3e41
+        else:
bd3e41
+            file.seek(max(0, middle - 1))
bd3e41
+            if middle > 0:
bd3e41
+                file.readline()
bd3e41
+            offset, line = file.tell(), file.readline()
bd3e41
+            if currentDepth < cacheDepth:
bd3e41
+                cache[middle] = (offset, line)
bd3e41
         #print start, middle, end, offset, line,
bd3e41
-	if offset > end:
bd3e41
-	    assert end != middle - 1, "infinite loop"
bd3e41
-	    end = middle - 1
bd3e41
-	elif line[:keylen] == key:# and line[keylen + 1] == ' ':
bd3e41
-	    return line
bd3e41
+        if offset > end:
bd3e41
+            assert end != middle - 1, "infinite loop"
bd3e41
+            end = middle - 1
bd3e41
+        elif line[:keylen] == key:# and line[keylen + 1] == ' ':
bd3e41
+            return line
bd3e41
         #elif offset == end:
bd3e41
         #    return None
bd3e41
-	elif line > key:
bd3e41
-	    assert end != middle - 1, "infinite loop"
bd3e41
-	    end = middle - 1
bd3e41
-	elif line < key:
bd3e41
-	    start = offset + len(line) - 1
bd3e41
-	currentDepth = currentDepth + 1
bd3e41
+        elif line > key:
bd3e41
+            assert end != middle - 1, "infinite loop"
bd3e41
+            end = middle - 1
bd3e41
+        elif line < key:
bd3e41
+            start = offset + len(line) - 1
bd3e41
+        currentDepth = currentDepth + 1
bd3e41
         thisState = start, end
bd3e41
         if lastState == thisState:
bd3e41
             # detects the condition where we're searching past the end
bd3e41
@@ -1206,12 +1205,12 @@
bd3e41
     """
bd3e41
     index = 0
bd3e41
     for element in sequence:
bd3e41
-	value = element
bd3e41
-	if keyfn:
bd3e41
-	    value = keyfn(value)
bd3e41
-	if (not testfn and value == key) or (testfn and testfn(value, key)):
bd3e41
-	    return index
bd3e41
-	index = index + 1
bd3e41
+        value = element
bd3e41
+        if keyfn:
bd3e41
+            value = keyfn(value)
bd3e41
+        if (not testfn and value == key) or (testfn and testfn(value, key)):
bd3e41
+            return index
bd3e41
+        index = index + 1
bd3e41
     return None
bd3e41
 
bd3e41
 def _partition(sequence, size, count):
bd3e41
@@ -1224,7 +1223,7 @@
bd3e41
     
bd3e41
     partitions = []
bd3e41
     for index in range(0, size * count, size):
bd3e41
-	partitions.append(sequence[index:index + size])
bd3e41
+        partitions.append(sequence[index:index + size])
bd3e41
     return (partitions, sequence[size * count:])
bd3e41
 
bd3e41
 
bd3e41
@@ -1269,49 +1268,49 @@
bd3e41
       but the two implementations aren't directly comparable."""
bd3e41
    
bd3e41
     def __init__(this, capacity):
bd3e41
-	this.capacity = capacity
bd3e41
-	this.clear()
bd3e41
+        this.capacity = capacity
bd3e41
+        this.clear()
bd3e41
     
bd3e41
     def clear(this):
bd3e41
-	this.values = {}
bd3e41
-	this.history = {}
bd3e41
-	this.oldestTimestamp = 0
bd3e41
-	this.nextTimestamp = 1
bd3e41
+        this.values = {}
bd3e41
+        this.history = {}
bd3e41
+        this.oldestTimestamp = 0
bd3e41
+        this.nextTimestamp = 1
bd3e41
     
bd3e41
     def removeOldestEntry(this):
bd3e41
-	while this.oldestTimestamp < this.nextTimestamp:
bd3e41
-	    if this.history.get(this.oldestTimestamp):
bd3e41
-		key = this.history[this.oldestTimestamp]
bd3e41
-		del this.history[this.oldestTimestamp]
bd3e41
-		del this.values[key]
bd3e41
-		return
bd3e41
-	    this.oldestTimestamp = this.oldestTimestamp + 1
bd3e41
+        while this.oldestTimestamp < this.nextTimestamp:
bd3e41
+            if this.history.get(this.oldestTimestamp):
bd3e41
+                key = this.history[this.oldestTimestamp]
bd3e41
+                del this.history[this.oldestTimestamp]
bd3e41
+                del this.values[key]
bd3e41
+                return
bd3e41
+            this.oldestTimestamp = this.oldestTimestamp + 1
bd3e41
     
bd3e41
     def setCapacity(this, capacity):
bd3e41
-	if capacity == 0:
bd3e41
-	    this.clear()
bd3e41
-	else:
bd3e41
-	    this.capacity = capacity
bd3e41
-	    while len(this.values) > this.capacity:
bd3e41
-		this.removeOldestEntry()    
bd3e41
+        if capacity == 0:
bd3e41
+            this.clear()
bd3e41
+        else:
bd3e41
+            this.capacity = capacity
bd3e41
+            while len(this.values) > this.capacity:
bd3e41
+                this.removeOldestEntry()    
bd3e41
     
bd3e41
     def get(this, key, loadfn=None):
bd3e41
-	value = None
bd3e41
-	if this.values:
bd3e41
-	    pair = this.values.get(key)
bd3e41
-	    if pair:
bd3e41
-		(value, timestamp) = pair
bd3e41
-		del this.history[timestamp]
bd3e41
-	if value == None:
bd3e41
-	    value = loadfn and loadfn()
bd3e41
-	if this.values != None:
bd3e41
-	    timestamp = this.nextTimestamp
bd3e41
-	    this.nextTimestamp = this.nextTimestamp + 1
bd3e41
-	    this.values[key] = (value, timestamp)
bd3e41
-	    this.history[timestamp] = key
bd3e41
-	    if len(this.values) > this.capacity:
bd3e41
-		this.removeOldestEntry()
bd3e41
-	return value
bd3e41
+        value = None
bd3e41
+        if this.values:
bd3e41
+            pair = this.values.get(key)
bd3e41
+            if pair:
bd3e41
+                (value, timestamp) = pair
bd3e41
+                del this.history[timestamp]
bd3e41
+        if value == None:
bd3e41
+            value = loadfn and loadfn()
bd3e41
+        if this.values != None:
bd3e41
+            timestamp = this.nextTimestamp
bd3e41
+            this.nextTimestamp = this.nextTimestamp + 1
bd3e41
+            this.values[key] = (value, timestamp)
bd3e41
+            this.history[timestamp] = key
bd3e41
+            if len(this.values) > this.capacity:
bd3e41
+                this.removeOldestEntry()
bd3e41
+        return value
bd3e41
 
bd3e41
 
bd3e41
 class _NullCache:
bd3e41
@@ -1319,10 +1318,10 @@
bd3e41
     LRUCache implements), but doesn't store any values."""
bd3e41
     
bd3e41
     def clear():
bd3e41
-	pass
bd3e41
+        pass
bd3e41
     
bd3e41
     def get(this, key, loadfn=None):
bd3e41
-	return loadfn and loadfn()
bd3e41
+        return loadfn and loadfn()
bd3e41
 
bd3e41
 
bd3e41
 DEFAULT_CACHE_CAPACITY = 1000
bd3e41
@@ -1335,7 +1334,7 @@
bd3e41
 def enableCache():
bd3e41
     """Enable the entity cache."""
bd3e41
     if not isinstance(_entityCache, LRUCache):
bd3e41
-	_entityCache = _LRUCache(size)
bd3e41
+        _entityCache = _LRUCache(size)
bd3e41
 
bd3e41
 def clearCache():
bd3e41
     """Clear the entity cache."""
bd3e41
@@ -1373,36 +1372,36 @@
bd3e41
     _POSNormalizationTable = {}
bd3e41
     _POStoDictionaryTable = {}
bd3e41
     for pos, abbreviations in (
bd3e41
-	    (NOUN, "noun n n."),
bd3e41
-	    (VERB, "verb v v."),
bd3e41
-	    (ADJECTIVE, "adjective adj adj. a s"),
bd3e41
-	    (ADVERB, "adverb adv adv. r")):
bd3e41
-	tokens = string.split(abbreviations)
bd3e41
-	for token in tokens:
bd3e41
-	    _POSNormalizationTable[token] = pos
bd3e41
-	    _POSNormalizationTable[string.upper(token)] = pos
bd3e41
+            (NOUN, "noun n n."),
bd3e41
+            (VERB, "verb v v."),
bd3e41
+            (ADJECTIVE, "adjective adj adj. a s"),
bd3e41
+            (ADVERB, "adverb adv adv. r")):
bd3e41
+        tokens = abbreviations.split()
bd3e41
+        for token in tokens:
bd3e41
+            _POSNormalizationTable[token] = pos
bd3e41
+            _POSNormalizationTable[token.upper()] = pos
bd3e41
     for dict in Dictionaries:
bd3e41
-	_POSNormalizationTable[dict] = dict.pos
bd3e41
-	_POStoDictionaryTable[dict.pos] = dict
bd3e41
+        _POSNormalizationTable[dict] = dict.pos
bd3e41
+        _POStoDictionaryTable[dict.pos] = dict
bd3e41
 
bd3e41
 _initializePOSTables()
bd3e41
 
bd3e41
 def _normalizePOS(pos):
bd3e41
     norm = _POSNormalizationTable.get(pos)
bd3e41
     if norm:
bd3e41
-	return norm
bd3e41
-    raise TypeError, `pos` + " is not a part of speech type"
bd3e41
+        return norm
bd3e41
+    raise TypeError(repr(pos) + " is not a part of speech type")
bd3e41
 
bd3e41
 def _dictionaryFor(pos):
bd3e41
     pos = _normalizePOS(pos)
bd3e41
     dict = _POStoDictionaryTable.get(pos)
bd3e41
     if dict == None:
bd3e41
-	raise RuntimeError, "The " + `pos` + " dictionary has not been created"
bd3e41
+        raise RuntimeError("The " + repr(pos) + " dictionary has not been created")
bd3e41
     return dict
bd3e41
 
bd3e41
 def buildIndexFiles():
bd3e41
     for dict in Dictionaries:
bd3e41
-	dict._buildIndexCacheFile()
bd3e41
+        dict._buildIndexCacheFile()
bd3e41
 
bd3e41
 
bd3e41
 #
bd3e41
@@ -1412,7 +1411,7 @@
bd3e41
 def _testKeys():
bd3e41
     #This is slow, so don't do it as part of the normal test procedure.
bd3e41
     for dictionary in Dictionaries:
bd3e41
-	dictionary._testKeys()
bd3e41
+        dictionary._testKeys()
bd3e41
 
bd3e41
 def _test(reset=0):
bd3e41
     import doctest, wordnet