Merge pull request #37 from cclauss/modernize-python2-code

Modernize Python 2 code to get ready for Python 3

Author: crista

01-good-old-times/tf-01.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import sys, os, string
 
 # Utility for handling the intermediate 'secondary memory'
@@ -121,6 +122,6 @@ def touchopen(filename, *args, **kwargs):
 
 for tf in data[0:25]: # elimination of symbol tf is exercise
     if len(tf) == 2:
-        print (tf[0], ' - ', tf[1])
+        print(tf[0], ' - ', tf[1])
 # We're done
 word_freqs.close()

02-go-forth/forth.py

@@ -1,10 +1,16 @@
 #!/usr/local/bin/python
 #
 #   f o r t h . p y
-#   Author: Chris Meyers @ 
+#   Author: Chris Meyers @
 #           http://openbookproject.net/py4fun/forth/forth.html
 #
-import sys, re
+from __future__ import print_function
+import re
+
+try:
+    raw_input          # Python 2
+except NameError:
+    raw_input = input  # Python 3
 
 ds       = []          # The data stack
 cStack   = []          # The control struct stack
@@ -15,14 +21,14 @@
 def main() :
     while 1 :
         pcode = compile()          # compile/run from user
-        if pcode == None : print; return
+        if pcode == None : print(); return
         execute(pcode)
 
 #============================== Lexical Parsing
-        
+
 def getWord (prompt="... ") :
     global words
-    while not words : 
+    while not words :
         try    : lin = raw_input(prompt)+"\n"
         except : return None
         if lin[0:1] == "@" : lin = open(lin[1:-1]).read()
@@ -56,8 +62,8 @@ def rSwap(cod,p) : a=ds.pop(); b=ds.pop(); ds.append(a); ds.append(b)
 def rDup (cod,p) : ds.append(ds[-1])
 def rDrop(cod,p) : ds.pop()
 def rOver(cod,p) : ds.append(ds[-2])
-def rDump(cod,p) : print "ds = ", ds
-def rDot (cod,p) : print ds.pop()
+def rDump(cod,p) : print("ds = ", ds)
+def rDot (cod,p) : print(ds.pop())
 def rJmp (cod,p) : return cod[p]
 def rJnz (cod,p) : return (cod[p],p+1)[ds.pop()]
 def rJz  (cod,p) : return (p+1,cod[p])[ds.pop()==0]
@@ -92,7 +98,7 @@ def rComa(cod,p) :                                 # push tos into heap
 
   'create': rCreate, 'does>': rDoes,
 }
-#================================= Compile time 
+#================================= Compile time
 
 def compile() :
     pcode = []; prompt = "Forth> "
@@ -114,12 +120,12 @@ def compile() :
             try : pcode.append(int(word))
             except :
                 try: pcode.append(float(word))
-                except : 
+                except :
                     pcode[-1] = rRun     # Change rPush to rRun
                     pcode.append(word)   # Assume word will be defined
         if not cStack : return pcode
         prompt = "...    "
-    
+
 def fatal (mesg) : raise mesg
 
 def cColon (pcode) :
@@ -168,5 +174,5 @@ def cThen (pcode) :
   ':'    : cColon, ';'    : cSemi, 'if': cIf, 'else': cElse, 'then': cThen,
   'begin': cBegin, 'until': cUntil,
 }
-  
+
 if __name__ == "__main__" : main()

02-go-forth/tf-02.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import sys, re, operator, string
 
 #
@@ -104,7 +105,7 @@ def sort():
 # the last word there will be one item left
 while stack[-1] < 25 and len(stack) > 1:
     heap['i'] = stack.pop()
-    (w, f) = stack.pop(); print w, ' - ', f
+    (w, f) = stack.pop(); print(w, ' - ', f)
     stack.append(heap['i']); stack.append(1)
     stack.append(stack.pop() + stack.pop())
 

03-monolith/tf-03.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import sys, string
 # the global list of [word, frequency] pairs
 word_freqs = []
@@ -46,5 +47,5 @@
         i += 1
 
 for tf in word_freqs[0:25]:
-    print tf[0], ' - ', tf[1]
+    print(tf[0], ' - ', tf[1])
 

04-cookbook/tf-04.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import sys, string
 
 # The shared mutable data
@@ -54,7 +55,7 @@ def remove_stop_words():
 def frequencies():
     """
     Creates a list of pairs associating
-    words with frequencies 
+    words with frequencies
     """
     global words
     global word_freqs
@@ -70,7 +71,7 @@ def sort():
     Sorts word_freqs by frequency
     """
     global word_freqs
-    word_freqs.sort(lambda x, y: cmp(y[1], x[1]))
+    word_freqs.sort(key=lambda x: x[1], reverse=True)
 
 
 #
@@ -84,5 +85,4 @@ def sort():
 sort()
 
 for tf in word_freqs[0:25]:
-    print tf[0], ' - ', tf[1]
-
+    print(tf[0], ' - ', tf[1])

05-pipeline/tf-05.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import sys, re, operator, string
 
 #
@@ -65,7 +66,7 @@ def print_all(word_freqs):
     Takes a list of pairs where the entries are sorted by frequency and print them recursively.
     """
     if(len(word_freqs) > 0):
-        print word_freqs[0][0], ' - ', word_freqs[0][1]
+        print(word_freqs[0][0], ' - ', word_freqs[0][1])
         print_all(word_freqs[1:]);
 
 #

06-code-golf/tf-06-1.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import re, string, sys
 
 stops = set(open("../stop_words.txt").read().split(",") + list(string.ascii_lowercase))
 words = [x.lower() for x in re.split("[^a-zA-Z]+", open(sys.argv[1]).read()) if len(x) > 0 and x.lower() not in stops]
 unique_words = list(set(words))
-unique_words.sort(lambda x, y: cmp(words.count(y), words.count(x)))
-print "\n".join(["%s - %s" % (x, words.count(x)) for x in unique_words[:25]])
+unique_words.sort(key=lambda x: words.count(x), reverse=True)
+print("\n".join(["%s - %s" % (x, words.count(x)) for x in unique_words[:25]]))

06-code-golf/tf-06-bm.py

@@ -1 +1,3 @@
+from __future__ import print_function
+from functools import reduce
 print (reduce(lambda string, tup: string + tup[0] + ' - ' + str(tup[1]) + '\n', sorted( filter(lambda tup: tup[0] not in open(__import__('os').path.join(__import__('os').path.dirname(__file__), '..', 'stop_words.txt')).read().lower().split(','),  reduce(lambda word_dict, word: word_dict if (word_dict.__setitem__(word, word_dict.get(word, 0) + 1) if True else None) else word_dict, filter(lambda word: len(word) > 1, (''.join(map(lambda letter: ' ' if ord(letter) not in set(range(ord('a'), ord('z') + 1)) else letter, open(__import__('sys').argv[1]).read().lower()))).split()), {}).iteritems()), key=lambda tup: tup[1], reverse=True)[0:25], '')) # hole in one?

06-code-golf/tf-06-pn.py

@@ -2,10 +2,11 @@
 # My golf score is slightly lower!  
 # Best wishes, Peter Norvig
 
+from __future__ import print_function
 import re, sys, collections
 
 stopwords = set(open('../stop_words.txt').read().split(','))
 words = re.findall('[a-z]{2,}', open(sys.argv[1]).read().lower())
 counts = collections.Counter(w for w in words if w not in stopwords)
 for (w, c) in counts.most_common(25):
-    print w, '-', c
+    print(w, '-', c)

06-code-golf/tf-06.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import heapq, re, sys
 
 words = re.findall("[a-z]{2,}", open(sys.argv[1]).read().lower())
 for w in heapq.nlargest(25, set(words) - set(open("../stop_words.txt").read().split(",")), words.count):
-    print w, "-", words.count(w)
+    print(w, "-", words.count(w))