May 21, 2018 · May 4, 2018 · May 15, 2018 · May 15, 2018 · May 15, 2018 · May 15, 2018
diff --git a/.gitignore b/.gitignore
 env
 *.pyc
 __pycache__/
 .DS_Store
 .DS_Store
 .vscode
diff --git a/chp18/_clean_data.txt → ...dix-B-regular-expressions/_clean_data.txt b/chp18/_clean_data.txt → ...dix-B-regular-expressions/_clean_data.txt
diff --git a/chp18/_sloppy_data.txt → ...ix-B-regular-expressions/_sloppy_data.txt b/chp18/_sloppy_data.txt → ...ix-B-regular-expressions/_sloppy_data.txt
diff --git a/chp18/phone-book-fun.py → ...x-B-regular-expressions/phone-book-fun.py b/chp18/phone-book-fun.py → ...x-B-regular-expressions/phone-book-fun.py
diff --git a/chp18/phone_list.py → appendix-B-regular-expressions/phone_list.py b/chp18/phone_list.py → appendix-B-regular-expressions/phone_list.py
diff --git a/chp18/regex-groups.py → ...dix-B-regular-expressions/regex-groups.py b/chp18/regex-groups.py → ...dix-B-regular-expressions/regex-groups.py
diff --git a/chp18/regex-namedgroups.py → ...-regular-expressions/regex-namedgroups.py b/chp18/regex-namedgroups.py → ...-regular-expressions/regex-namedgroups.py
diff --git a/chp18/regex-validation-refactor.py → ...-expressions/regex-validation-refactor.py b/chp18/regex-validation-refactor.py → ...-expressions/regex-validation-refactor.py
diff --git a/chp18/regex-validation.py → ...B-regular-expressions/regex-validation.py b/chp18/regex-validation.py → ...B-regular-expressions/regex-validation.py
diff --git a/chp18/regex_answers.txt → ...x-B-regular-expressions/regex_answers.txt b/chp18/regex_answers.txt → ...x-B-regular-expressions/regex_answers.txt
diff --git a/chp18/regex_review.py → ...dix-B-regular-expressions/regex_review.py b/chp18/regex_review.py → ...dix-B-regular-expressions/regex_review.py
diff --git a/chp19/dog_class.py → appendix-C-primer-on-oop/dog_class.py b/chp19/dog_class.py → appendix-C-primer-on-oop/dog_class.py
diff --git a/chp19/dog_inheritance.py → appendix-C-primer-on-oop/dog_inheritance.py b/chp19/dog_inheritance.py → appendix-C-primer-on-oop/dog_inheritance.py
diff --git a/chp19/dog_instance_methods.py → ...x-C-primer-on-oop/dog_instance_methods.py b/chp19/dog_instance_methods.py → ...x-C-primer-on-oop/dog_instance_methods.py
diff --git a/chp19/dog_isinstance.py → appendix-C-primer-on-oop/dog_isinstance.py b/chp19/dog_isinstance.py → appendix-C-primer-on-oop/dog_isinstance.py
diff --git a/chp19/dog_walking.py → appendix-C-primer-on-oop/dog_walking.py b/chp19/dog_walking.py → appendix-C-primer-on-oop/dog_walking.py
diff --git a/chp19/github_with_class.py → ...ndix-C-primer-on-oop/github_with_class.py b/chp19/github_with_class.py → ...ndix-C-primer-on-oop/github_with_class.py
diff --git a/chp19/my_farm.py → appendix-C-primer-on-oop/my_farm.py b/chp19/my_farm.py → appendix-C-primer-on-oop/my_farm.py
diff --git a/chp19/oldest_dog.py → appendix-C-primer-on-oop/oldest_dog.py b/chp19/oldest_dog.py → appendix-C-primer-on-oop/oldest_dog.py
diff --git a/chp19/oop_comp_check.md → appendix-C-primer-on-oop/oop_comp_check.md b/chp19/oop_comp_check.md → appendix-C-primer-on-oop/oop_comp_check.md
diff --git a/chp19/pet_class.py → appendix-C-primer-on-oop/pet_class.py b/chp19/pet_class.py → appendix-C-primer-on-oop/pet_class.py
diff --git a/chp01/1-1.py → ch02-getting-started/1-2-4.py b/chp01/1-1.py → ch02-getting-started/1-2-4.py
 # 1.1 review exercises
 # 1.2.4 - Screw Things Up
 # Solutions to review exercies


 ''' The following line won't run because of a syntax error '''
 # Exercise 1
 # The following line won't run because of a syntax error
 print("hi)

 # We didn't close the double quotes at the end of the string.
 # The line above needed to have been:
 # print("hi")


 # Exercise 2
 ''' The following lines won't run properly,
    even if the syntax error in the line above is corrected,
    because of a run-time error '''
 # We meant to print the string "hello";
 # a variable named 'hello' doesn't exist yet.
 # This line could have been:
 #myString = "hello"
 # print(myString)
 #my_string = "hello"
 # print(my_string)
diff --git a/ch02-getting-started/1-2-5.py b/ch02-getting-started/1-2-5.py
 # 1.2.5 - Store a Variable
 # Solutions to review exercies


 # Exercise 3 (exercises 1 and 2 are done in interactive window)
 # This solution works for Exercises 1 and 2 by typing the same lines into the
 # interactive window.

 # display a string directly
 print("hello")


 # display the contents of a string variable
 my_string = "hi"
 print(my_string)
diff --git a/ch04-fundamentals-strings-and-methods/1-4-0.py b/ch04-fundamentals-strings-and-methods/1-4-0.py
 # 1.4 - Fundamentals: Strings and Methods
 # Solutions to review exercies


 # Exercise 1
 print('There are "double quotes" in this string.')


 # Exercise 2
 print("This string's got an apostrophe.")


 # Exercise 3
 print('''This string was written on multiple lines,
      and it displays across multiple lines''')


 # Exercise 4
 print("This one-line string was written out \
      using multiple lines")
diff --git a/chp03/3-2.py → ...fundamentals-strings-and-methods/1-4-1.py b/chp03/3-2.py → ...fundamentals-strings-and-methods/1-4-1.py
 # 3.2 review exercises
 # 1.4.1 - Mess Around With Your Words
 # Solutions to review exercies


 # Exercise 1
 # Display the number of letters in the string
 my_word = "antidisestablishmentarianism"
 print(len(my_word))

 # Exercise 2
 # Concatenate two strings together
 string_left = "bat"
 string_right = "man"
 print(string_left + string_right)

 # Exercise 3
 # Display two strings together, with a space in between
 string_one = "heebie"
 string_two = "jeebies"
 print(string_one, string_two)


 # Exercise 4
 # Use subscripting to display part of a string
 print("bazinga"[2:6])


 # A more advanced way to do the above example would be:
 my_string = "bazinga"
 start_index = 2
diff --git a/chp03/3-3.py → ...fundamentals-strings-and-methods/1-4-2.py b/chp03/3-3.py → ...fundamentals-strings-and-methods/1-4-2.py
 # 3.3 review exercises
 # 1.4.2 - Use Objects and Methods
 # Solutions to review exercies


 # Exercise 1
 # Take input from the user and display that input back
 my_input = input("Type something: ")
 print(my_input)


 # Exercise 2
 # Display the input string converted to lower-case letters
 print(my_input.lower())
diff --git a/chp03/first_letter.py → ...fundamentals-strings-and-methods/1-4-3.py b/chp03/first_letter.py → ...fundamentals-strings-and-methods/1-4-3.py
 # chapter 3 first_letter.py
 # 1.4.3 - Assignment: Pick Apart Your User's Input
 # Solution to assignment


 # Return the upper-case first letter entered by the user

 user_input = input("Tell me your password: ")
diff --git a/chp04/4-1.py → ...undamentals-working-with-strings/1-5-0.py b/chp04/4-1.py → ...undamentals-working-with-strings/1-5-0.py
 # 4.1 review exercises
 # 1.5.0 - Fundamentals: Working with Strings
 # Solutions to review exercies


 # Exercise 1
 # Store an integer as a string
 my_integer_string = "6"

 print(int(my_integer_string) * 7)


 # Exercise 2
 # Store a floating-point number as a string
 my_float_string = "6.01"

 print(float(my_float_string) * 7)


 # Exercise 3
 # Create a string and an int object, then display them together
 my_string = "mp"
 my_int = 3
diff --git a/chp04/4-2.py → ...undamentals-working-with-strings/1-5-1.py b/chp04/4-2.py → ...undamentals-working-with-strings/1-5-1.py
 # 4.2 review exercises
 # 1.5.1 - Streamline Your Print Statements
 # Solutions to review exercies


 # Exercise 1
 weight = 0.2
 animal = "newt"

 # Concatenate a number and a string in one print statement
 print(str(weight) + " kg is the weight of the newt.")


 # Exercise 2
 # Use format() to print a number and a string inside of another string
 print("{} kg is the weight of the {}.".format(weight, animal))


 # Exercise 3
 # Use format() to add objects inside a string using index numbers
 # (Here we reversed the arguments - just because we could.)
 print("{1} kg is the weight of the {0}.".format(animal, weight))


 # Exercise 4
 # Use format() to print new objects inside a string
 print("{} kg is the weight of the {}.".format(0.2, "newt"))

 # Use formatted string literal to reference new objects inside a string

 # Exercise 5
 # Use formatted string literal to reference objects inside a string
 print(f"{weight} kg is the weight of the {animal}.")
diff --git a/chp04/4-3.py → ...undamentals-working-with-strings/1-5-2.py b/chp04/4-3.py → ...undamentals-working-with-strings/1-5-2.py
 # 4.3 review exercises
 # 1.5.2 - Find a String in a String
 # Solutions to review exercies


 # Exercise 1
 # Cannot find the string "a" in the string "AAA":
 print("AAA".find("a"))


 # Exercise 2
 # Try to find a number inside a string;
 # use str() to convert the number first
 version = "version 2.0"
 v_num = 2.0
 print(version.find(str(v_num)))


 # Exercise 3
 # Try to find an upper-case "X" in user input:
 my_input = input("Type something: ")
 print(my_input.find("X"))
diff --git a/chp04/translate.py → ...undamentals-working-with-strings/1-5-3.py b/chp04/translate.py → ...undamentals-working-with-strings/1-5-3.py
 # chapter 4 translate.py
 # 1.5.3 - Assignment: Turn Your User Into a l33t h4x0r
 # Solution to assignment


 # Turn a user's input into leetspeak

 my_text = input("Enter some text: ")
diff --git a/chp05/exponent.py → ...fundamentals-functions-and-loops/1-6-1.py b/chp05/exponent.py → ...fundamentals-functions-and-loops/1-6-1.py
 # chapter 5 exponent.py
 # 1.6.1 - Assignment: Perform Calculations on User Input
 # Solution to Assignment


 # Receive two input numbers and calculate their power

 base = input("Enter a base: ")
diff --git a/chp05/5-1.py → ...fundamentals-functions-and-loops/1-6-3.py b/chp05/5-1.py → ...fundamentals-functions-and-loops/1-6-3.py
 # 5.1 review exercises
 # 1.6.3 - Functions Summary
 # Solutions to review exercises


 # Exercise 1
 def cube(num):
 ''' Returnsthe cube of the input number '''
 """Returnthe cube of the input number."""
    cube_num = num * num * num
    return cube_num


 print("0 cubed is", cube(0))
 print("2 cubed is", cube(2))


 # Exercise 2
 def multiply(num1, num2):
 ''' Returnsthe result of multiplying two input numbers '''
 """Returnthe result of multiplying two input numbers."""
    return num1 * num2


 mult_result = multiply(2, 5)
 print("2 times 5 is", mult_result)
diff --git a/chp05/temperature.py → ...fundamentals-functions-and-loops/1-6-4.py b/chp05/temperature.py → ...fundamentals-functions-and-loops/1-6-4.py
 # chapter 5 temperature.py
 # Convert Celsius and Fahrenheit temperatures using functions
 # 1.6.4 - Assignment: Convert temperatures
 # Solution to assignment


 # Convert Celsius and Fahrenheit temperatures using functions

 def convert_cel_to_far(cel_temp):
    far_temp = cel_temp * 9 / 5 + 32
    cel_temp = (far_temp - 32) * 5 / 9
    return cel_temp


 temp1 = 72
 print("{} degrees F = {} degrees C".format(temp1, convert_far_to_cel(temp1)))

diff --git a/chp05/5-2.py → ...fundamentals-functions-and-loops/1-6-5.py b/chp05/5-2.py → ...fundamentals-functions-and-loops/1-6-5.py
 # 5.2 review exercises
 # 1.6.5 - Run in Circles
 # Solutions to review exercises


 # Exercise 1
 # print the integer 2 through 10 using a "for" loop
 for i in range(2, 11):
    print(i)


 # Exercise 2
 # print the integer 2 through 10 using a "while" loop
 i = 2
 while (i < 11):
    print(i)
    i = i + 1


 # Exercise 3
 def doubles(num):
 '''Return the result of multiplying an input number by 2 '''
 """Return the result of multiplying an input number by 2."""
    return num * 2


 # Call doubles to double the number 2 three times
 my_num = 2
 for i in range(0, 3):
diff --git a/chp05/invest.py → ...fundamentals-functions-and-loops/1-6-6.py b/chp05/invest.py → ...fundamentals-functions-and-loops/1-6-6.py
 # chapter 5 invest.py
 # calculate compound interest to track the growth of an investment
 # 1.6.6 - Assignment: Track Your Investments
 # Solution to Assignment


 # calculate compound interest to track the growth of an investment

 def invest(amount, rate, time):
    print("principal amount: ${}".format(amount))
        print("year {}: ${}".format(t, amount))
    print()


 invest(100, .05, 8)
 invest(2000, .025, 5)
diff --git a/chp07/7-1.py → ch08-fundamentals-conditional-logic/1-8-1.py b/chp07/7-1.py → ch08-fundamentals-conditional-logic/1-8-1.py
 # 7.1 review exercises
 # 1.8.1 - Compare Values
 # Solutions to review exercises


 # Test whether these expressions are True or False

 print(1 <= 1)
 print(1 != 1)
 print(1 != 2)
diff --git a/chp07/7-2.py → ch08-fundamentals-conditional-logic/1-8-2.py b/chp07/7-2.py → ch08-fundamentals-conditional-logic/1-8-2.py
 # 7.2 review exercises
 # 1.8.2 - Add Some Logic
 # Solutions to review exercises


 # Test whether these expressions are True or False

 print((1 <= 1) and (1 != 1))
 print(not (1 != 2))
 print(("good" != "bad") or False)
diff --git a/chp07/7-3.py → ch08-fundamentals-conditional-logic/1-8-3.py b/chp07/7-3.py → ch08-fundamentals-conditional-logic/1-8-3.py
 # 7.3 review exercises
 # 1.8.3 - Control the Flow of Your Program
 # Solutions to review exercises


 # Display whether the length of user input is <, > or = 5 characters

 my_input = input("Type something: ")

 if len(my_input) < 5:
diff --git a/chp07/factors.py → ch08-fundamentals-conditional-logic/1-8-4.py b/chp07/factors.py → ch08-fundamentals-conditional-logic/1-8-4.py
 # chapter 7 factors.py
 # 1.8.4 - Assignment: Find the Factors of a Number
 # Solution to assignment


 # display all the factors of a number chosen by the user

 num = int(input("Enter a positive integer: "))
diff --git a/chp07/7-4.py → ch08-fundamentals-conditional-logic/1-8-5.py b/chp07/7-4.py → ch08-fundamentals-conditional-logic/1-8-5.py
 # 7.4 review exercises
 # 1.8.5 - Break Out of the Pattern
 # Solutions to review exercises


 # Exercise 1
 # Run in an infinite loop until the user types "q" or "Q"
 while True:
    my_input = input('Type "q" or "Q" to quit: ')
    if my_input.upper() == "Q":
        break


 # Exercise 2
 # Display every number from 1 through 50 except multiples of 3
 for i in range(1, 51):
    if i % 3 == 0:
diff --git a/chp07/7-5.py → ch08-fundamentals-conditional-logic/1-8-6.py b/chp07/7-5.py → ch08-fundamentals-conditional-logic/1-8-6.py
 # 7.5 review exercises
 # 1.8.6 - Recover From Errors
 # Solution to review exercises


 # Ask the user to enter an integer.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,5 @@ py3venv
		env
		*.pyc
		__pycache__/
		.DS_Store
		.DS_Store
		.vscode
Original file line number	Diff line number	Diff line change
		@@ -1,14 +1,17 @@
		# 1.1 review exercises
		# 1.2.4 - Screw Things Up
		# Solutions to review exercies


		''' The following line won't run because of a syntax error '''
		# Exercise 1
		# The following line won't run because of a syntax error
		print("hi)

		# We didn't close the double quotes at the end of the string.
		# The line above needed to have been:
		# print("hi")


		# Exercise 2
		''' The following lines won't run properly,
		even if the syntax error in the line above is corrected,
		because of a run-time error '''
Expand All		@@ -17,5 +20,5 @@
		# We meant to print the string "hello";
		# a variable named 'hello' doesn't exist yet.
		# This line could have been:
		#myString = "hello"
		# print(myString)
		#my_string = "hello"
		# print(my_string)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,15 @@
		# 1.2.5 - Store a Variable
		# Solutions to review exercies


		# Exercise 3 (exercises 1 and 2 are done in interactive window)
		# This solution works for Exercises 1 and 2 by typing the same lines into the
		# interactive window.

		# display a string directly
		print("hello")


		# display the contents of a string variable
		my_string = "hi"
		print(my_string)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,20 @@
		# 1.4 - Fundamentals: Strings and Methods
		# Solutions to review exercies


		# Exercise 1
		print('There are "double quotes" in this string.')


		# Exercise 2
		print("This string's got an apostrophe.")


		# Exercise 3
		print('''This string was written on multiple lines,
		and it displays across multiple lines''')


		# Exercise 4
		print("This one-line string was written out \
		using multiple lines")
Original file line number	Diff line number	Diff line change
		@@ -1,25 +1,29 @@
		# 3.2 review exercises
		# 1.4.1 - Mess Around With Your Words
		# Solutions to review exercies


		# Exercise 1
		# Display the number of letters in the string
		my_word = "antidisestablishmentarianism"
		print(len(my_word))

		# Exercise 2
		# Concatenate two strings together
		string_left = "bat"
		string_right = "man"
		print(string_left + string_right)

		# Exercise 3
		# Display two strings together, with a space in between
		string_one = "heebie"
		string_two = "jeebies"
		print(string_one, string_two)


		# Exercise 4
		# Use subscripting to display part of a string
		print("bazinga"[2:6])


		# A more advanced way to do the above example would be:
		my_string = "bazinga"
		start_index = 2
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,13 @@
		# 3.3 review exercises
		# 1.4.2 - Use Objects and Methods
		# Solutions to review exercies


		# Exercise 1
		# Take input from the user and display that input back
		my_input = input("Type something: ")
		print(my_input)


		# Exercise 2
		# Display the input string converted to lower-case letters
		print(my_input.lower())
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,7 @@
		# chapter 3 first_letter.py
		# 1.4.3 - Assignment: Pick Apart Your User's Input
		# Solution to assignment


		# Return the upper-case first letter entered by the user

		user_input = input("Tell me your password: ")
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,8 @@
		# 4.1 review exercises
		# 1.5.0 - Fundamentals: Working with Strings
		# Solutions to review exercies


		# Exercise 1
		# Store an integer as a string
		my_integer_string = "6"

Expand All		@@ -9,6 +11,7 @@
		print(int(my_integer_string) * 7)


		# Exercise 2
		# Store a floating-point number as a string
		my_float_string = "6.01"

Expand All		@@ -17,6 +20,7 @@
		print(float(my_float_string) * 7)


		# Exercise 3
		# Create a string and an int object, then display them together
		my_string = "mp"
		my_int = 3
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,20 +1,31 @@
		# 4.2 review exercises
		# 1.5.1 - Streamline Your Print Statements
		# Solutions to review exercies


		# Exercise 1
		weight = 0.2
		animal = "newt"

		# Concatenate a number and a string in one print statement
		print(str(weight) + " kg is the weight of the newt.")


		# Exercise 2
		# Use format() to print a number and a string inside of another string
		print("{} kg is the weight of the {}.".format(weight, animal))


		# Exercise 3
		# Use format() to add objects inside a string using index numbers
		# (Here we reversed the arguments - just because we could.)
		print("{1} kg is the weight of the {0}.".format(animal, weight))


		# Exercise 4
		# Use format() to print new objects inside a string
		print("{} kg is the weight of the {}.".format(0.2, "newt"))

		# Use formatted string literal to reference new objects inside a string

		# Exercise 5
		# Use formatted string literal to reference objects inside a string
		print(f"{weight} kg is the weight of the {animal}.")
Original file line number	Diff line number	Diff line change
		@@ -1,17 +1,21 @@
		# 4.3 review exercises
		# 1.5.2 - Find a String in a String
		# Solutions to review exercies


		# Exercise 1
		# Cannot find the string "a" in the string "AAA":
		print("AAA".find("a"))


		# Exercise 2
		# Try to find a number inside a string;
		# use str() to convert the number first
		version = "version 2.0"
		v_num = 2.0
		print(version.find(str(v_num)))


		# Exercise 3
		# Try to find an upper-case "X" in user input:
		my_input = input("Type something: ")
		print(my_input.find("X"))