updated baby names code that it is works with python3

diff --git a/README b/README
index 49e67dee53c6ddb9d7a5e13ff54a344f41e49d08..4dcc61532b162d5dc015c552b38f349598cb5876 100644 (file)
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
-Copyright ⓒ 2014  Benjamin Mako Hill (http://mako.cc/)
+Copyright ⓒ 2014-2015  Benjamin Mako Hill (http://mako.cc/)

 
 

-Released as free software under the GNU General Public License v2 or any
-later version.
+Released as free software under the GNU General Public License v3 or any later
+version.

 
 These are example programs for use in the Community Data Science
 Workshops. More details are available here:
 
 
 These are example programs for use in the Community Data Science
 Workshops. More details are available here:
 

-https://openhatch.org/wiki/Community_Data_Science_Workshops
+http://wiki.communitydata.cc/Community_Data_Science_Workshops

 
 Data for this project (the txt files) are downloaded from the US Social
 Security administration and are public domain:
 
 Data for this project (the txt files) are downloaded from the US Social
 Security administration and are public domain:

diff --git a/babynames1.py b/babynames1.py
index 8111cf35ded8f938641090b491d7e7ce5a438dd3..6070eee6abaad2a9753e848f2b83afbb7a734a71 100644 (file)
--- a/babynames1.py
+++ b/babynames1.py
@@ -2,5 +2,5 @@ import ssadata
 
 for name in ssadata.boys.keys():
     if name == "mako":
 
 for name in ssadata.boys.keys():
     if name == "mako":

-        print "There were " + str(ssadata.boys[name]) + " boys named " + name
+        print("There were " + str(ssadata.boys[name]) + " boys named " + name)

 
 

diff --git a/babynames2.py b/babynames2.py
index 752b4f5a97bff7fbdba2bf5fa3a3b9604a896540..075cb27bf0a36cb4ea9945fcd26e52776a8ff9bb 100644 (file)
--- a/babynames2.py
+++ b/babynames2.py
@@ -2,4 +2,4 @@ import ssadata
 
 for name in ssadata.boys.keys():
     if name in ssadata.girls.keys():
 
 for name in ssadata.boys.keys():
     if name in ssadata.girls.keys():

-        print name
+        print(name)

diff --git a/babynames3.py b/babynames3.py
index d393234990edadaeb1488e27339652651bc623cb..f83e0e8af8af0b39244feaacc75ebb52dad0f2cc 100644 (file)
--- a/babynames3.py
+++ b/babynames3.py
@@ -2,8 +2,8 @@ import ssadata
 
 for name in ssadata.boys.keys():
     if 'king' in name:
 
 for name in ssadata.boys.keys():
     if 'king' in name:

-        print name + " " + str(ssadata.boys[name])
+        print(name + " " + str(ssadata.boys[name]))

 
 for name in ssadata.girls.keys():
     if 'queen' in name:
 
 for name in ssadata.girls.keys():
     if 'queen' in name:

-        print name + " " + str(ssadata.girls[name])
+        print(name + " " + str(ssadata.girls[name]))

diff --git a/ssadata.py b/ssadata.py
index dc217e78adc5e362013ea8df31f462b92470f2a8..96055a3d77ca25e5d58ab6ad7f26f651e0f7b5e1 100644 (file)
--- a/ssadata.py
+++ b/ssadata.py
@@ -3,7 +3,7 @@ NAMES_LIST = "yob2013.txt"
 boys = {}
 girls = {}
 
 boys = {}
 girls = {}
 

-for line in file(NAMES_LIST, 'r').readlines():
+for line in open(NAMES_LIST, 'r').readlines():

     name, gender, count = line.strip().split(",")
     count = int(count)
 
     name, gender, count = line.strip().split(",")
     count = int(count)