Removing (object) from class defs

AllenDowney · AllenDowney · commit 5ea6ac1b4f20 · 2015-09-10T14:51:50.000-04:00
diff --git a/code/BadKangaroo.py b/code/BadKangaroo.py
@@ -19,7 +19,7 @@
 
 """
 
-class Kangaroo(object):
+class Kangaroo:
     """A Kangaroo is a marsupial."""
     
     def __init__(self, name, contents=[]):
diff --git a/code/Card.py b/code/Card.py
@@ -14,7 +14,7 @@
 import random
 
 
-class Card(object):
+class Card:
     """Represents a standard playing card.
     
     Attributes:
@@ -45,7 +45,7 @@ def __lt__(self, other):
         return t1 < t2
 
 
-class Deck(object):
+class Deck:
     """Represents a deck of cards.
 
     Attributes:
diff --git a/code/Circle.py b/code/Circle.py
@@ -17,7 +17,7 @@
 from Point1_soln import distance_between_points
 
 
-class Circle(object):
+class Circle:
     """Represents a circle.
 
     Attributes: center, radius
@@ -106,7 +106,7 @@ def main():
 
     circle = Circle
     circle.center = Point()
-    circle.center.x = 100.0
+    circle.center.x = 150.0
     circle.center.y = 100.0
     circle.radius = 75.0
 
diff --git a/code/GoodKangaroo.py b/code/GoodKangaroo.py
@@ -19,7 +19,7 @@
 
 """
 
-class Kangaroo(object):
+class Kangaroo:
     """A Kangaroo is a marsupial."""
     
     def __init__(self, name, contents=[]):
diff --git a/code/Map.py b/code/Map.py
@@ -12,7 +12,7 @@
 from __future__ import print_function, division
 
 
-class LinearMap(object):
+class LinearMap:
     """A simple implementation of a map using a list of tuples
     where each tuple is a key-value pair."""
 
@@ -33,7 +33,7 @@ def get(self, k):
         raise KeyError
 
 
-class BetterMap(object):
+class BetterMap:
     """A faster implementation of a map using a list of LinearMaps
     and the built-in function hash() to determine which LinearMap
     to put each key into."""
@@ -60,7 +60,7 @@ def get(self, k):
         return m.get(k)
 
 
-class HashMap(object):
+class HashMap:
     """An implementation of a hashtable using a BetterMap
     that grows so that the number of items never exceeds the number
     of LinearMaps.
diff --git a/code/Markov.py b/code/Markov.py
@@ -18,7 +18,7 @@
 from markov import skip_gutenberg_header, shift
 
 
-class Markov(object):
+class Markov:
     """Encapsulates the statistical summary of a text."""
 
     def __init__(self):
diff --git a/code/Point1.py b/code/Point1.py
@@ -12,7 +12,7 @@
 from __future__ import print_function, division
 
 
-class Point(object):
+class Point:
     """Represents a point in 2-D space.
 
     attributes: x, y
@@ -24,7 +24,7 @@ def print_point(p):
     print('(%g, %g)' % (p.x, p.y))
 
 
-class Rectangle(object):
+class Rectangle:
     """Represents a rectangle. 
 
     attributes: width, height, corner.
diff --git a/code/Point2_soln.py b/code/Point2_soln.py
@@ -12,7 +12,7 @@
 from __future__ import print_function, division
 
 
-class Point(object):
+class Point:
     """Represents a point in 2-D space.
 
     attributes: x, y
diff --git a/code/Time1.py b/code/Time1.py
@@ -12,7 +12,7 @@
 from __future__ import print_function, division
 
 
-class Time(object):
+class Time:
     """Represents the time of day.
        
     attributes: hour, minute, second
diff --git a/code/Time2.py b/code/Time2.py
@@ -12,7 +12,7 @@
 from __future__ import print_function, division
 
 
-class Time(object):
+class Time:
     """Represents the time of day.
        
     attributes: hour, minute, second
@@ -96,6 +96,7 @@ def main():
     start.print_time()
 
     end = start.increment(1337)
+    #end = start.increment(1337, 460)
     end.print_time()
 
     print('Is end after start?')
diff --git a/code/Time2_soln.py b/code/Time2_soln.py
@@ -12,7 +12,7 @@
 from __future__ import print_function, division
 
 
-class Time(object):
+class Time:
     """Represents the time of day.
        
     attributes: hour, minute, second
diff --git a/code/find_duplicates.py b/code/find_duplicates.py
@@ -20,6 +20,9 @@ def walk(dirname):
     dirname: string name of directory
     """
     names = []
+    if '__pycache__' in dirname:
+        return names
+
     for name in os.listdir(dirname):
         path = os.path.join(dirname, name)
 
diff --git a/code/find_duplicates_copy.py b/code/find_duplicates_copy.py
@@ -20,6 +20,9 @@ def walk(dirname):
     dirname: string name of directory
     """
     names = []
+    if '__pycache__' in dirname:
+        return names
+
     for name in os.listdir(dirname):
         path = os.path.join(dirname, name)
 
diff --git a/code/polygon.py b/code/polygon.py
@@ -87,7 +87,7 @@ def circle(t, r):
     # draw a circle centered on the origin
     radius = 100
     bob.pu()
-    bob.fd( radius)
+    bob.fd(radius)
     bob.lt(90)
     bob.pd()
     circle(bob, radius)
diff --git a/code/reducible.py b/code/reducible.py
@@ -18,7 +18,7 @@ def make_word_dict():
     fin = open('words.txt')
     for line in fin:
         word = line.strip().lower()
-        d[word] = word
+        d[word] = None
 
     # have to add single letter words to the word list;
     # also, the empty string is considered a word.
diff --git a/code/rotate_pairs.py b/code/rotate_pairs.py
@@ -21,7 +21,7 @@ def make_word_dict():
     fin = open('words.txt')
     for line in fin:
         word = line.strip().lower()
-        d[word] = word
+        d[word] = None
 
     return d
 
