cleanup work

krother · Aug 24, 2023 · 75823db · 75823db
1 parent 7417273
commit 75823db
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 198 deletions.
diff --git a/appendix/goals.md b/appendix/goals.md
diff --git a/challenges/count_words/README.md b/challenges/count_words/README.md
@@ -1,5 +1,5 @@
 
-# Coding Challenge: Count Words in Moby Dick
+# Count Words
 
 ## In this challenge you can learn:
 

diff --git a/data_structures/data_types.md b/data_structures/data_types.md
diff --git a/first_steps/for.rst b/first_steps/for.rst
@@ -20,7 +20,6 @@ area topic
 🐞   recognize bugs at runtime
 ==== =============================
 
---------------
 
 Exercise 1: Pat your own shoulder
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/first_steps/hello.rst b/first_steps/hello.rst
@@ -125,7 +125,6 @@ Exercise 6: Three little bugs
 
 The following program should output a song by Bob Marley.
 It contains three bugs.
-
 Find and fix them.
 
 .. code:: python3

diff --git a/first_steps/installing_python.rst b/first_steps/installing_python.rst
@@ -33,7 +33,6 @@ both are not that easy to configure.
 
 If you prefer to use the standard Python installation, you find it on
 `www.python.org <https://www.python.org/downloads/>`__.
-
 In that case, install spyder using the Python package manager ``pip``.
 Type:
 

diff --git a/first_steps/python_shell.rst b/first_steps/python_shell.rst
@@ -6,7 +6,6 @@ Python as a Calculator
 `photograph by Charles Deluvio on
 Unsplash <https://unsplash.com/@charlesdeluvio>`__
 
---------------
 
 In this chapter you will:
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -22,7 +21,6 @@ area topic
 🔧   use the Variable Explorer
 ==== ================================
 
---------------
 
 Arithmetics
 -----------

diff --git a/first_steps/rock_paper_scissors.rst b/first_steps/rock_paper_scissors.rst
@@ -6,10 +6,9 @@ Rock-Paper-Scissors
 `image by Enzoklop, CC BY-SA
 3.0 <https://commons.wikimedia.org/w/index.php?curid=27958795>`__
 
---------------
 
-In this chapter you will learn to:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In this chapter you will:
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ======= ====================================
 area    topic

diff --git a/first_steps/slideshow.rst b/first_steps/slideshow.rst
@@ -21,7 +21,6 @@ area topic
 🐞   fix wrong file paths
 ==== ===============================
 
---------------
 
 Exercise 1: Display an image
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/first_steps/type_conversions.rst b/first_steps/type_conversions.rst
@@ -6,7 +6,7 @@ Ada Lovelace
 
    Ada Lovelace
 
-`Ada Lovelace, image by Alfred Edward Chalon - Biography.com, public
+`Ada Lovelace, image by Alfred Edward Chalon - public
 domain <https://commons.wikimedia.org/w/index.php?curid=25519820>`__
 
 

diff --git a/index.rst b/index.rst
@@ -1,22 +1,24 @@
 Python Exercises for Beginners
 ==============================
 
-.. topic:: Target Audience
-
-   Here you find exercises for people new to Python.
-   I wrote them for teachers looking for material
-   and people learning Python by themselves.
-
-   The goal of the exercises is to enable you to write
-   Python programs up to 200 lines.   
-   The exercises cover six areas:
-
-   - 🚀 **applications** - programs that do fun stuff
-   - 💡 **functions and data types**
-   - ⚙ **syntax** - grammar rules, keywords and special
-   - **patterns** - useful expressions and idioms
-   - 🔧 **tools** that make programming easier
-   - 🐞 **debugging** techniques to discover and fix broken code
+Here you find exercises for people new to Python.
+I wrote them for teachers looking for material
+and people learning Python by themselves.
+
+The goal of the exercises is to enable you to write
+Python programs up to 200 lines.   
+The exercises cover six areas:
+
+=============================== ===================================
+area                            description
+=============================== ===================================
+🚀 **applications**             programs that do fun stuff
+💡 **functions and data types** useful Python objects                
+⚙ **syntax**                    grammar rules and keywords
+🔀 **patterns**                  useful expressions and idioms
+🔧 **tools**                    things that make programming easier
+🐞 **debugging**                discover and fix broken code
+=============================== ===================================
 
 
 First Steps
@@ -46,7 +48,6 @@ Data Structures
    data_structures/lists.md
    data_structures/dictionaries.md
    data_structures/tables.md
-   data_structures/data_types.md
 
 --------------
 

diff --git a/reference/data_types.rst b/reference/data_types.rst
@@ -1,6 +1,14 @@
 Data Types in Python
 ====================
 
+
+Match the data samples with their types.
+
+.. figure:: datatypes.png
+   :alt: datatype exercise
+
+   datatype exercise
+
 ========= ========================== ========= =======
 data type description                composite mutable
 ========= ========================== ========= =======
@@ -15,11 +23,20 @@ set       collection of unique items yes       yes
 NoneType  just nothing               no        no
 ========= ========================== ========= =======
 
-Basic and composite data types
-------------------------------
+Composite data types
+--------------------
 
-**Basic** means that a data type does not contain any other types.
-**Composite** means that a data type contains other types.
+Some data types are **composite**, meaning that they may contain objects of other types.
+For instance, a `list` can contains strings, numbers or even other lists.
+
+Immutable and mutable data types
+--------------------------------
+
+In Python there are basic and composite data types. The values of basic
+data types cannot be changed, they are **immutable**. Most of the
+composite data types are **mutable**.
+
+--------------
 
 Immutable and mutable data types
 --------------------------------
@@ -33,14 +50,30 @@ The immutable data types in Python are:
 -  Boolean (``True`` / ``False``)
 -  Integer (``0``, ``1``, ``-3``)
 -  Float (``1.0``, ``-0.3``, ``1.2345``)
--  Strings (``'apple'``, ``"banana"``) - both single and double quotes
-   are valid
+-  Strings (``'apple'``, ``"banana"``) - both single and double quotes are valid
 -  None (aka an empty variable)
--  Tuples (multiple values in parentheses,
-   e.g. \ ``('Jack', 'Smith', 1990)``)
+-  Tuples (multiple values in parentheses, e.g. \ ``('Jack', 'Smith', 1990)``)
 
 The mutable data types are
 
 -  List [1, 2, 2, 3]
 -  Dictionary {‘name’: ‘John Smith’, ‘year’: 1990}
--  Set ``{1, 2, 3}``
+-  Set ()
+
+--------------
+
+Type conversions
+----------------
+
+Values can be converted into each other using *conversion functions*.
+Try the following:
+
+::
+
+   int('5.5')
+   float(5)
+   str(5.5)
+   list("ABC")
+   tuple([1,2,3])
+   dict([('A',1),('B',2)])
+   set([1,2,2,3])
diff --git a/data_structures/datatypes.png → reference/datatypes.png b/data_structures/datatypes.png → reference/datatypes.png
diff --git a/tabular_data/os.md b/tabular_data/os.md
@@ -1,5 +1,5 @@
 
-# Working with directories
+# Working with Directories
 
 To process bigger amounts of data, you will need to work on more than one file. Sometimes you don't know all the files in advance.
 

diff --git a/tabular_data/parsing.md b/tabular_data/parsing.md
@@ -1,5 +1,5 @@
 
-# Parsing data from text
+# Parsing Data from Text
 
 Most text files contain both text and numbers. Extracting these data fields from a file and storing them in reasonably *structured* variables is called **parsing**. To parse files, we need methods of strings, lists and **type conversions**.
 

diff --git a/tabular_data/readfile.md b/tabular_data/readfile.md
@@ -1,5 +1,5 @@
 
-# Reading text files
+# Reading Text Files
 
 In this chapter, you will learn to extract information from simple text files.