Merge branch 'barbarer:master' into master

Author: xinyinghou

.gitignore

@@ -1,7 +1,16 @@
 published
 build
 __pycache__
-.DS_Store
+*.DS_Store
 *~
 *.pyc
 build-info
+.cache
+output/*
+logs/*
+.vscode
+.idea
+.error_schema.log
+build_success
+build.log
+.web_assets.pkl

_sources/functions/funcWithSetsAndDict.rst

@@ -51,7 +51,7 @@ You can also check if an item is in a set.
     print(1 in s1)
     print(9 in s1)
 
-.. fillintheblank:: funct_tuple_test_char
+.. fillintheblank:: funct_set_tuple_test_char
     :practice: T
 
     What characters are used to inintialize the values in a set in the code above?
@@ -253,7 +253,7 @@ You can use the following methods with sets.
     print(s1.symmetric_difference(s2))
     print(s1 ^ s2)
 
-.. fillintheblank:: funct_exor_fitb
+.. fillintheblank:: funct_set_exor_fitb
     :practice: T
 
     What character is used to find the symmetric difference (exlusive or) between two sets in the code above?
@@ -355,15 +355,15 @@ Dictionaries
 
 A dictionary stores a value for a key. The keys must be immutable and unique.
 
-.. fillintheblank:: funct_dict_num_t
+.. fillintheblank:: funct_set_dict_num_t
 
     What is the first thing the code below prints?
 
     - :2: It prints the number of t's in the string.
       :3: A 'T' is different from a 't'.
       :.*: Try again!
 
-.. activecode:: func_dict_example
+.. activecode:: func_set_dict_example
     :caption: Example with a dictionary
 
     Run this code to see what it prints.
@@ -385,12 +385,12 @@ A dictionary stores a value for a key. The keys must be immutable and unique.
     print(d1)
     print(type(d1))
 
-.. shortanswer:: func_dict_key_error_sa
+.. shortanswer:: func_set_dict_key_error_sa
 
    Look at the Python code below.  What do you think will happen when you run the following code?
 
 
-.. activecode:: func_dict_with_key_error
+.. activecode:: func_set_dict_with_key_error
     :caption: Example with a dictionary
 
     Run this code to see what it prints.
@@ -402,7 +402,7 @@ A dictionary stores a value for a key. The keys must be immutable and unique.
 
 There is another way to update the value for a key that works even if the key isn't in the dictionary already.
 
-.. activecode:: func_dict_example_v2
+.. activecode:: func_set_dict_example_v2
     :caption: Example with a dictionary
 
     Run this code to see what it prints.
@@ -467,5 +467,5 @@ There is another way to update the value for a key that works even if the key is
 
 If you worked in a group, you can copy the answers from this page to the other group members.  Select the group members below and click the button to share the answers.
 
-.. groupsub:: func_tuplesanddict_groupsub
+.. groupsub:: func_set_tuplesanddict_groupsub
    :limit: 3

_sources/functions/func_Str_Cond.rst

@@ -8,7 +8,8 @@ in groups on activities and each member has an assigned role.  For more informat
 
    If you work in a group, have only one member of the group fill in the answers on this page.  You will be able to share your answers with the group at the bottom of the page.
 
-**Learning Objectives**
+Learning Objectives
+====================
 
 Students will know and be able to do the following.
 
@@ -131,6 +132,8 @@ a string covers more than one line.
 String Indices
 ==================
 
+You can get a character from a string at an index (position) using ``string[index]``.
+
 .. fillintheblank:: fsc_fitb_pogil_initials_v2
 
     What is the last thing that will be printed when the code below runs?
@@ -141,7 +144,7 @@ String Indices
 .. activecode:: fsc_ac_pogil_initials_v2
     :caption: get_initials
 
-    Run the code below to see what it prints.  Then fix it to pass the given test.  It should return a string with the
+    Run the code below to see what it prints.  Then fix it to pass the test shown below the code.  It should return a string with the
     first character of the first name and first character of the last name.
     ~~~~
     # function definition
@@ -160,6 +163,7 @@ String Indices
     # function call
     main()
 
+    ====
     from unittest.gui import TestCaseGui
     class myTests(TestCaseGui):
 
@@ -172,13 +176,15 @@ String Indices
 
 .. note::
 
-   Use [index] to get a character from a string.  The first character in a string is at index 0 and the last is at the length of the string minus 1 (also know as index -1 in Python).  
+   Use ``string[index]`` to get a character from a string.  The first character in a string is at index 0 and the last is at the length of the string minus 1 (also know as index -1 in Python).  
 
 Fix the function ``get_initials`` above to return a string with the first letter of the first name followed by the first letter of the last name.
 
 String Slices
 ==================
 
+You can get a copy of part or all of a string using ``str_name[start:end]``.
+
 .. fillintheblank:: fsc_fitb_pogil_short_name
 
     What is the last thing that will be printed when the code below runs?
@@ -217,6 +223,14 @@ String Slices
     - :dna\[0\:3\]|\[:3\]: This will return a new string with the characters from index 0 to 2.
       :.*: Look at the note above and try again.
 
+.. fillintheblank:: fsc_fitb_len_string
+    :practice: T
+
+    What built-in function tells you the number of characters in a string?
+
+    - :len: The len function takes a string and returns the number of characters in it.
+      :.*: Look at the example code above.
+
 
 Basic Conditionals and Tests
 ============================
@@ -237,13 +251,13 @@ Basic Conditionals and Tests
     # function definition
     def get_temp_desc(temp):
         if temp < 32:
-            return "Baby, its cold outside!"
+            return "Baby, its cold outside! The temp is " + str(temp)
         elif temp < 70:
-            return "Wear a coat"
+            return "Wear a coat The temp is " + str(temp)
         elif temp < 80:
-            return "Feels great!"
+            return "Feels great! The temp is " + str(temp)
         else:
-            return "Too hot to handle!"
+            return "Too hot to handle!  The temp is " + str(temp)
 
     # function definition
     def main():
@@ -253,6 +267,10 @@ Basic Conditionals and Tests
     # function call
     main()
 
+.. note::
+
+   You must first convert a number to a string using ``str(nun)`` if you want to add it to a string using ``+``.
+
 .. fillintheblank:: fsc_fitb_pogil_elif
 
     What keyword is used in a conditional statement when you want three of more possible outcomes?
@@ -286,9 +304,6 @@ Basic Conditionals and Tests
     # function call
     main()
 
-.. note::
-
-   You must first convert a number to a string using ``str(nun)`` if you want to add it to a string using ``+``.
 
 .. parsonsprob:: fsc_pogil_check-guess-Parsons-v2
    :numbered: left

_sources/tuples/mixedupcode.rst

@@ -1,4 +1,4 @@
-Tuples Mixed-Up Code Questions
+Mixed-Up Code Questions
 ------------------------------
 
 .. selectquestion:: Tups_MixedUpCode_1_sq

_sources/tuples/mixedupcode_orig.rst

@@ -1,5 +1,5 @@
-Mixed-Up Code Questions
-------------------------
+Mixed-Up Code Questions - Source 
+--------------------------------
 
 .. parsonsprob:: tup_mixedupcode_1
     :numbered: left