Merge branch 'master' of https://github.com/Akuli/python-tutorial

Akuli · Akuli · commit 23625a7bd870 · 2016-12-01T09:34:29.000+02:00
diff --git a/TODO.md b/TODO.md
@@ -24,3 +24,10 @@ This tutorial is not complete. It still needs:
     - "What the heck is this?" section for stuff i haven't talked about
         - regexes
         - yield
+
+***
+
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
+
+[Back to the list of contents](README.md#list-of-contents)
diff --git a/answers.md b/answers.md
@@ -288,6 +288,7 @@ These are answers for exercises in the chapters. In programming, there's always
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/classes.md b/classes.md
@@ -274,8 +274,8 @@ Methods are "links" to the class attribute functions. So
 and when `stackoverflow.info()` is called it automatically gets
 `stackoverflow` as an argument.
 
-In other words, `Class.method(instance)` does the same thing as
-`instance.method()`. This also works with built-in classes, for
+In other words, **`Class.method(instance)` does the same thing as
+`instance.method()`**. This also works with built-in classes, for
 example `'hello'.lower()` is same as `str.lower('hello')`.
 
 ## Defining methods when defining the class
@@ -286,7 +286,7 @@ it later?
 ```py
 >>> class Website:
 ...     
-...     def info(self):     # self is a Website instance
+...     def info(self):     # self will be stackoverflow
 ...         print("URL:", self.url)
 ...         print("Founding year:", self.founding_year)
 ...         print("Free to use:", self.free_to_use)
@@ -421,6 +421,8 @@ print("You entered " + word + ".")
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](modules.md) | [Next](README.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/contact-me.md b/contact-me.md
@@ -18,6 +18,7 @@ it, there are a few ways to contact me:
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/defining-functions.md b/defining-functions.md
@@ -544,6 +544,8 @@ Answers for the first and second exercise are [here](answers.md).
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](dicts.md) | [Next](what-is-true.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/dicts.md b/dicts.md
@@ -191,3 +191,11 @@ me: my password
 ```
 
 **TODO:** lists as keys vs tuples as keys.
+
+***
+
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
+
+[Previous](trey-hunner-zip-and-enumerate.md) | [Next](defining-functions.md) |
+[Back to the list of contents](README.md#list-of-contents)
diff --git a/editor-setup.md b/editor-setup.md
@@ -138,6 +138,7 @@ about it here, [tell me](contact-me.md).
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/exceptions.md b/exceptions.md
@@ -475,4 +475,8 @@ except OSError:
 
 ***
 
-You may use this tutorial at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
+
+[Previous](files.md) | [Next](modules.md) |
+[Back to the list of contents](README.md#list-of-contents)
diff --git a/files.md b/files.md
@@ -372,6 +372,8 @@ else:
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](what-is-true.md) | [Next](exceptions.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/getting-help.md b/getting-help.md
@@ -53,6 +53,7 @@ help on IRC is much faster.
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/getting-started.md b/getting-started.md
@@ -213,6 +213,8 @@ Powers are calculated before `*` and `/`, but after `()`.
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](installing-python.md) | [Next](the-way-of-the-program.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/handy-stuff-strings.md b/handy-stuff-strings.md
@@ -158,6 +158,12 @@ Again, nothing can modify strings in-place. Most string methods
 return a new string, but things like `our_string = our_string.upper()`
 still work because the new string is assigned to the old variable.
 
+Also note that all of these methods are used like `our_string.stuff()`,
+not like `stuff(our_string)`. The idea with that is that our string
+knows how to do all these things, like `our_string.stuff()`, we don't
+need a separate function that does these things like `stuff(our_string)`.
+We'll learn more about methods [later](classes.md).
+
 Here's an example with some of the most commonly used string methods:
 
 ```py
@@ -233,6 +239,18 @@ Python has multiple ways to format strings. One is not necessarily
 better than others, they are just different. Here's a few ways to solve
 our problem:
 
+- `.format()`-formatting, also known as new-style formatting. This
+    formatting style has a lot of features, but it's a little bit more
+    typing than `%s`-formatting.
+
+    ```py
+    >>> "Hello {}.".format(name)
+    'Hello Akuli.'
+    >>> "My name is {} and I'm on the {} channel on {}.".format(name, channel, network)
+    "My name is Akuli and I'm on the ##learnpython channel on freenode."
+    >>> 
+    ```
+
 - `%s`-formatting, also known as printf-formatting and old-style
     formatting. This has less features than `.format()`-formatting, but
     `'Hello %s.' % name` is shorter and faster to type than
@@ -269,18 +287,6 @@ our problem:
 
     Here `(thestuff,)` was a tuple that contained nothing but `thestuff`.
 
-- `.format()`-formatting, also known as new-style formatting. This
-    formatting style has a lot of features, but it's a little bit more
-    typing than `%s`-formatting.
-
-    ```py
-    >>> "Hello {}.".format(name)
-    'Hello Akuli.'
-    >>> "My name is {} and I'm on the {} channel on {}.".format(name, channel, network)
-    "My name is Akuli and I'm on the ##learnpython channel on freenode."
-    >>> 
-    ```
-
 - f-strings are even less typing, but new in Python 3.6. **Use this only if
     you know that nobody will need to run your code on Python versions older
     than 3.6.** Here the f is short for "format", and the content of the
@@ -393,6 +399,8 @@ ValueError: could not convert string to float: 'hello'
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](if.md) | [Next](lists-and-tuples.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/if.md b/if.md
@@ -335,6 +335,8 @@ The answers are [here](answers.md).
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](using-functions.md) | [Next](handy-stuff-strings.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/installing-python.md b/installing-python.md
@@ -109,6 +109,8 @@ Now you should have Python installed, and you should be able run it.
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](what-is-programming.md) | [Next](getting-started.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/lists-and-tuples.md b/lists-and-tuples.md
@@ -118,6 +118,29 @@ multiple items from another list and remove removes an item.
 >>> 
 ```
 
+Note that `remove` removes only the first match it finds.
+
+```py
+>>> names = ['theelous3', 'go|dfish', 'theelous3']
+>>> names.remove('theelous3')
+>>> names    # the second theelous3 is still there!
+['go|dfish', 'theelous3']
+>>> 
+```
+
+If we need to remove all matching items we can use a simple while loop.
+We'll talk more about loops [in the next chapter](loops.md).
+
+```py
+>>> names = ['theelous3', 'go|dfish', 'theelous3']
+>>> while 'theelous3' in names:
+...     names.remove('theelous3')
+... 
+>>> names
+['go|dfish']
+>>> 
+```
+
 We can also use slicing and indexing to change the content:
 
 ```py
@@ -186,7 +209,7 @@ False
 >>> 
 ```
 
-If we need a new list with the same content we can use the
+If we need **a new list with similar content** we can use the
 `copy` method.
 
 ```py
@@ -205,7 +228,7 @@ like this:
 
 ![Different lists.](images/differentlist.png)
 
-If you're using Python 3.2 or older you can do `a[:]` instead
+If you're using Python 3.2 or older you need to do `a[:]` instead
 of `a.copy()`. `a[:]` is a slice of the whole list, just like
 `a[0:]`.
 
@@ -242,7 +265,7 @@ used in places like `(1 + 2) * 3`.
 ```
 
 Tuples don't have methods like append, extend and remove
-because they can't change theirselves in-place.
+because they can't change themselves in-place.
 
 ```py
 >>> stuff = (1, 2, 3)
@@ -287,6 +310,8 @@ else:
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](handy-stuff-strings.md) | [Next](loops.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/loops.md b/loops.md
@@ -321,6 +321,8 @@ of `stuff.copy()` and `stuff[:] = []` instead of `stuff.clear()`.
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](lists-and-tuples.md) | [Next](trey-hunner-zip-and-enumerate.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/modules.md b/modules.md
@@ -487,6 +487,8 @@ section at the bottom.
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](exceptions.md) | [Next](classes.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/the-way-of-the-program.md b/the-way-of-the-program.md
@@ -38,6 +38,8 @@ learned everything.
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](getting-started.md) | [Next](variables.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/trey-hunner-zip-and-enumerate.md b/trey-hunner-zip-and-enumerate.md
@@ -135,6 +135,8 @@ The answers are [here](answers.md).
 
 ***
 
-You may use this tutorial freely at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
 
+[Previous](loops.md) | [Next](dicts.md) |
 [Back to the list of contents](README.md#list-of-contents)
diff --git a/update-ends.py b/update-ends.py
diff --git a/using-functions.md b/using-functions.md
diff --git a/variables.md b/variables.md
diff --git a/what-is-programming.md b/what-is-programming.md
diff --git a/what-is-true.md b/what-is-true.md
