Updating code

AllenDowney · AllenDowney · commit cbc2a155e455 · 2015-07-03T15:04:20.000-04:00
diff --git a/code/metathesis.py b/code/metathesis.py
@@ -1,24 +1,29 @@
-"""This module contains code from
-Think Python by Allen B. Downey
-http://thinkpython.com
+"""This module contains a code example related to
 
-Copyright 2012 Allen B. Downey
-License: GNU GPLv3 http://www.gnu.org/licenses/gpl.html
+Think Python, 2nd Edition
+by Allen Downey
+http://thinkpython2.com
 
+Copyright 2015 Allen Downey
+
+License: http://creativecommons.org/licenses/by/4.0/
 """
 
-from anagram_sets import *
+from __future__ import print_function, division
+
+import anagram_sets
+
 
 def metathesis_pairs(d):
     """Print all pairs of words that differ by swapping two letters.
 
     d: map from word to list of anagrams
     """
-    for anagrams in d.itervalues():
+    for anagrams in d.values():
         for word1 in anagrams:
             for word2 in anagrams:
                 if word1 < word2 and word_distance(word1, word2) == 2:
-                    print word1, word2
+                    print(word1, word2)
 
 
 def word_distance(word1, word2):
@@ -39,5 +44,5 @@ def word_distance(word1, word2):
 
 
 if __name__ == '__main__':
-    d = all_anagrams('words.txt')
-    metathesis_pairs(d)
+    sets = anagram_sets.all_anagrams('words.txt')
+    metathesis_pairs(sets)
diff --git a/code/most_frequent.py b/code/most_frequent.py
@@ -1,13 +1,15 @@
-"""This module contains code from
-Think Python by Allen B. Downey
-http://thinkpython.com
+"""This module contains a code example related to
 
-Copyright 2012 Allen B. Downey
-License: GNU GPLv3 http://www.gnu.org/licenses/gpl.html
+Think Python, 2nd Edition
+by Allen Downey
+http://thinkpython2.com
 
+Copyright 2015 Allen Downey
+
+License: http://creativecommons.org/licenses/by/4.0/
 """
 
-import random
+from __future__ import print_function, division
 
 
 def most_frequent(s):
@@ -51,7 +53,7 @@ def read_file(filename):
 
 
 if __name__ == '__main__':
-    s = read_file('words.txt')
-    t = most_frequent(s)
-    for x in t:
-        print x
+    string = read_file('emma.txt')
+    letter_seq = most_frequent(string)
+    for x in letter_seq:
+        print(x)
diff --git a/code/palindrome_soln.py b/code/palindrome_soln.py
@@ -1,12 +1,17 @@
-"""This module contains code from
-Think Python by Allen B. Downey
-http://thinkpython.com
+"""This module contains a code example related to
 
-Copyright 2012 Allen B. Downey
-License: GNU GPLv3 http://www.gnu.org/licenses/gpl.html
+Think Python, 2nd Edition
+by Allen Downey
+http://thinkpython2.com
 
+Copyright 2015 Allen Downey
+
+License: http://creativecommons.org/licenses/by/4.0/
 """
 
+from __future__ import print_function, division
+
+
 def first(word):
     """Returns the first character of a string."""
     return word[0]
@@ -31,8 +36,8 @@ def is_palindrome(word):
     return is_palindrome(middle(word))
 
 
-print is_palindrome('allen')
-print is_palindrome('bob')
-print is_palindrome('otto')
-print is_palindrome('redivider')
+print(is_palindrome('allen'))
+print(is_palindrome('bob'))
+print(is_palindrome('otto'))
+print(is_palindrome('redivider'))
 
