Finally rewrote the code for Python3!

This commit is contained in:
Crista Lopes
2018-12-13 19:57:17 -08:00
parent 4449f0b7ba
commit ed8c3cabaa
47 changed files with 70 additions and 115 deletions

View File

@@ -1,5 +1,4 @@
#!/usr/bin/env python
from __future__ import print_function
import sys, operator, string, os, threading, re
from util import getch, cls, get_input
from time import sleep
@@ -15,7 +14,7 @@ class FreqObserver(threading.Thread):
self.daemon,self._end = True, False
# freqs is the part of the model to be observed
self._freqs = freqs
self._freqs_0 = sorted(self._freqs.iteritems(), key=operator.itemgetter(1), reverse=True)[:25]
self._freqs_0 = sorted(self._freqs.items(), key=operator.itemgetter(1), reverse=True)[:25]
self.start()
def run(self):
@@ -29,7 +28,7 @@ class FreqObserver(threading.Thread):
def _update_view(self):
lock.acquire()
freqs_1 = sorted(self._freqs.iteritems(), key=operator.itemgetter(1), reverse=True)[:25]
freqs_1 = sorted(self._freqs.items(), key=operator.itemgetter(1), reverse=True)[:25]
lock.release()
if (freqs_1 != self._freqs_0):
self._update_display(freqs_1)

View File

@@ -1,5 +1,4 @@
#!/usr/bin/env python
from __future__ import print_function
import sys, re, operator, collections
class WordFrequenciesModel:
@@ -29,7 +28,7 @@ class WordFrequenciesView:
model.register(self)
def render(self):
sorted_freqs = sorted(self._model.freqs.iteritems(), key=operator.itemgetter(1), reverse=True)
sorted_freqs = sorted(self._model.freqs.items(), key=operator.itemgetter(1), reverse=True)
for (w, c) in sorted_freqs[:25]:
print(w, '-', c)

View File

@@ -1,5 +1,4 @@
#!/usr/bin/env python
from __future__ import print_function
import sys, re, operator, collections
class WordFrequenciesModel:
@@ -23,7 +22,7 @@ class WordFrequenciesView:
self._model = model
def render(self):
sorted_freqs = sorted(self._model.freqs.iteritems(), key=operator.itemgetter(1), reverse=True)
sorted_freqs = sorted(self._model.freqs.items(), key=operator.itemgetter(1), reverse=True)
for (w, c) in sorted_freqs[0:25]:
print(w, '-', c)