From 55660ce3c7be442cbe83e98fd33edbf40210669b Mon Sep 17 00:00:00 2001
From: Louie Dinh <ldinh@athinkingape.com>
Date: Sat, 3 May 2014 17:17:43 -0700
Subject: Add Python 3 tutorial

---
 python3.html.markdown | 578 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 578 insertions(+)
 create mode 100644 python3.html.markdown

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
new file mode 100644
index 00000000..3a1bc1c3
--- /dev/null
+++ b/python3.html.markdown
@@ -0,0 +1,578 @@
+---
+language: python
+contributors:
+    - ["Louie Dinh", "http://pythonpracticeprojects.com"]
+filename: learnpython.py
+---
+
+Python was created by Guido Van Rossum in the early 90's. It is now one of the most popular
+languages in existence. I fell in love with Python for its syntactic clarity. It's basically
+executable pseudocode.
+
+Feedback would be highly appreciated! You can reach me at [@louiedinh](http://twitter.com/louiedinh) or louiedinh [at] [google's email service]
+
+Note: This article applies to Python 3 specifically. Check out the other tutorial if you want to learn the old Python 2.7
+
+```python
+
+# Single line comments start with a number symbol.
+
+""" Multiline strings can be written
+    using three "'s, and are often used
+    as comments
+"""
+
+####################################################
+## 1. Primitive Datatypes and Operators
+####################################################
+
+# You have numbers
+3  # => 3
+
+# Math is what you would expect
+1 + 1  # => 2
+8 - 1  # => 7
+10 * 2  # => 20
+
+# Except division which returns floats by default
+35 / 5  # => 7.0
+
+# When you use a float, results are floats
+3 * 2.0 # => 6.0
+
+# Enforce precedence with parentheses
+(1 + 3) * 2  # => 8
+
+
+# Boolean values are primitives
+True
+False
+
+# negate with not
+not True  # => False
+not False  # => True
+
+
+# Equality is ==
+1 == 1  # => True
+2 == 1  # => False
+
+# Inequality is !=
+1 != 1  # => False
+2 != 1  # => True
+
+# More comparisons
+1 < 10  # => True
+1 > 10  # => False
+2 <= 2  # => True
+2 >= 2  # => True
+
+# Comparisons can be chained!
+1 < 2 < 3  # => True
+2 < 3 < 2  # => False
+
+
+# Strings are created with " or '
+"This is a string."
+'This is also a string.'
+
+# Strings can be added too! But try not to do this.
+"Hello " + "world!"  # => "Hello world!"
+
+# A string can be treated like a list of characters
+"This is a string"[0]  # => 'T'
+
+# .format can be used to format strings, like this:
+"{} can be {}".format("strings", "interpolated")
+
+# You can repeat the formatting arguments to save some typing.
+"{0} be nimble, {0} be quick, {0} jump over the {1}".format("Jack", "candle stick") #=> "Jack be nimble, Jack be quick, Jack jump over the candle stick"
+# You can use keywords if you don't want to count.
+"{name} wants to eat {food}".format(name="Bob", food="lasagna") #=> "Bob wants to eat lasagna"
+
+
+# None is an object
+None  # => None
+
+# Don't use the equality "==" symbol to compare objects to None
+# Use "is" instead. This checks for equality of object identity.
+"etc" is None  # => False
+None is None  # => True
+
+# None, 0, and empty strings/lists/dicts all evaluate to False.
+# All other values are True
+bool(0)  # => False
+bool("")  # => False
+bool([]) #=> False
+bool({}) #=> False
+
+
+####################################################
+## 2. Variables and Collections
+####################################################
+
+# Python has a print function
+print("I'm Python. Nice to meet you!")
+
+# No need to declare variables before assigning to them. Convention is to use lower_case_with_underscores
+some_var = 5
+some_var  # => 5
+
+# Accessing a previously unassigned variable is an exception.
+# See Control Flow to learn more about exception handling.
+some_unknown_var  # Raises a NameError
+
+# Lists store sequences
+li = []
+# You can start with a prefilled list
+other_li = [4, 5, 6]
+
+# Add stuff to the end of a list with append
+li.append(1)    # li is now [1]
+li.append(2)    # li is now [1, 2]
+li.append(4)    # li is now [1, 2, 4]
+li.append(3)    # li is now [1, 2, 4, 3]
+# Remove from the end with pop
+li.pop()        # => 3 and li is now [1, 2, 4]
+# Let's put it back
+li.append(3)    # li is now [1, 2, 4, 3] again.
+
+# Access a list like you would any array
+li[0]  # => 1
+# Look at the last element
+li[-1]  # => 3
+
+# Looking out of bounds is an IndexError
+li[4]  # Raises an IndexError
+
+# You can look at ranges with slice syntax.
+# (It's a closed/open range for you mathy types.)
+li[1:3]  # => [2, 4]
+# Omit the beginning
+li[2:]  # => [4, 3]
+# Omit the end
+li[:3]  # => [1, 2, 4]
+# Select every second entry
+li[::2]   # =>[1, 4]
+# Revert the list
+li[::-1]   # => [3, 4, 2, 1]
+# Use any combination of these to make advanced slices
+# li[start:end:step]
+
+# Remove arbitrary elements from a list with "del"
+del li[2]   # li is now [1, 2, 3]
+
+# You can add lists
+li + other_li   # => [1, 2, 3, 4, 5, 6] - Note: values for li and for other_li are not modified.
+
+# Concatenate lists with "extend()"
+li.extend(other_li)   # Now li is [1, 2, 3, 4, 5, 6]
+
+# Check for existence in a list with "in"
+1 in li   # => True
+
+# Examine the length with "len()"
+len(li)   # => 6
+
+
+# Tuples are like lists but are immutable.
+tup = (1, 2, 3)
+tup[0]   # => 1
+tup[0] = 3  # Raises a TypeError
+
+# You can do all those list thingies on tuples too
+len(tup)   # => 3
+tup + (4, 5, 6)   # => (1, 2, 3, 4, 5, 6)
+tup[:2]   # => (1, 2)
+2 in tup   # => True
+
+# You can unpack tuples (or lists) into variables
+a, b, c = (1, 2, 3)     # a is now 1, b is now 2 and c is now 3
+# Tuples are created by default if you leave out the parentheses
+d, e, f = 4, 5, 6
+# Now look how easy it is to swap two values
+e, d = d, e     # d is now 5 and e is now 4
+
+
+# Dictionaries store mappings
+empty_dict = {}
+# Here is a prefilled dictionary
+filled_dict = {"one": 1, "two": 2, "three": 3}
+
+# Look up values with []
+filled_dict["one"]   # => 1
+
+# Get all keys as a list with "keys()". We need to wrap the call in list() because we are getting back an iterable. We'll talk about those later.
+list(filled_dict.keys())   # => ["three", "two", "one"]
+# Note - Dictionary key ordering is not guaranteed.
+# Your results might not match this exactly.
+
+# Get all values as a list with "values()". Once again we need to wrap it in list() to get it out of the iterable.
+list(filled_dict.values())   # => [3, 2, 1]
+# Note - Same as above regarding key ordering.
+
+# Check for existence of keys in a dictionary with "in"
+"one" in filled_dict   # => True
+1 in filled_dict   # => False
+
+# Looking up a non-existing key is a KeyError
+filled_dict["four"]   # KeyError
+
+# Use "get()" method to avoid the KeyError
+filled_dict.get("one")   # => 1
+filled_dict.get("four")   # => None
+# The get method supports a default argument when the value is missing
+filled_dict.get("one", 4)   # => 1
+filled_dict.get("four", 4)   # => 4
+
+# "setdefault()" inserts into a dictionary only if the given key isn't present
+filled_dict.setdefault("five", 5)  # filled_dict["five"] is set to 5
+filled_dict.setdefault("five", 6)  # filled_dict["five"] is still 5
+
+# Remove keys from a dictionary with del
+del filled_dict["one"]  # Removes the key "one" from filled dict
+
+
+# Sets store ... well sets
+empty_set = set()
+# Initialize a set with a bunch of values. Yeah, it looks a bit like a dict. Sorry.
+some_set = {1, 1, 2, 2, 3, 4}   # some_set is now {1, 2, 3, 4}
+
+# Add more items to a set
+filled_set.add(5)   # filled_set is now {1, 2, 3, 4, 5}
+
+# Do set intersection with &
+other_set = {3, 4, 5, 6}
+filled_set & other_set   # => {3, 4, 5}
+
+# Do set union with |
+filled_set | other_set   # => {1, 2, 3, 4, 5, 6}
+
+# Do set difference with -
+{1, 2, 3, 4} - {2, 3, 5}   # => {1, 4}
+
+# Check for existence in a set with in
+2 in filled_set   # => True
+10 in filled_set   # => False
+
+
+####################################################
+## 3. Control Flow and Iterables
+####################################################
+
+# Let's just make a variable
+some_var = 5
+
+# Here is an if statement. Indentation is significant in python!
+# prints "some_var is smaller than 10"
+if some_var > 10:
+    print("some_var is totally bigger than 10.")
+elif some_var < 10:    # This elif clause is optional.
+    print("some_var is smaller than 10.")
+else:                  # This is optional too.
+    print("some_var is indeed 10.")
+
+
+"""
+For loops iterate over lists
+prints:
+    dog is a mammal
+    cat is a mammal
+    mouse is a mammal
+"""
+for animal in ["dog", "cat", "mouse"]:
+    # You can use % to interpolate formatted strings
+    print("{} is a mammal".format(animal))
+
+"""
+"range(number)" returns a list of numbers
+from zero to the given number
+prints:
+    0
+    1
+    2
+    3
+"""
+for i in range(4):
+    print(i)
+
+"""
+While loops go until a condition is no longer met.
+prints:
+    0
+    1
+    2
+    3
+"""
+x = 0
+while x < 4:
+    print(x)
+    x += 1  # Shorthand for x = x + 1
+
+# Handle exceptions with a try/except block
+try:
+    # Use "raise" to raise an error
+    raise IndexError("This is an index error")
+except IndexError as e:
+    pass    # Pass is just a no-op. Usually you would do recovery here.
+
+
+# Python's offers a fundamental abstraction called the Iterable.
+# An iterable is an object that can be treated as a sequence. 
+# The object returned the range function, is an iterable.
+
+filled_dict = {"one": 1, "two": 2, "three": 3}
+our_iterable = filled_dict.keys()
+print(our_iterable) #=> range(1,10). This is an object that implements our Iterable interface
+
+i We can loop over it.
+for i in our_iterable:
+    print(i)    # Prints one, two, three
+
+# However we cannot address elements by index.
+our_iterable[1]  # Raises a TypeError
+
+# An iterable is an object that knows how to create an iterator.
+our_iterator = iter(our_iterable)
+
+# Our iterator is an object that can remember the state as we traverse through it.
+# We get the next object by calling the __next__ function. 
+our_iterator.__next__()  #=> "one"
+
+# It maintains state as we call __next__.
+our_iterator.__next__()  #=> "two"
+our_iterator.__next__()  #=> "three"
+
+# After the iterator has returned all of its data, it gives you a StopIterator Exception
+our_iterator.__next__() # Raises StopIteration
+
+# You can grab all the elements of an iterator by calling list() on it.
+list(filled_dict.keys())  #=> Returns ["one", "two", "three"]
+
+
+
+####################################################
+## 4. Functions
+####################################################
+
+# Use "def" to create new functions
+def add(x, y):
+    print("x is %s and y is %s" % (x, y))
+    return x + y    # Return values with a return statement
+
+# Calling functions with parameters
+add(5, 6)   # => prints out "x is 5 and y is 6" and returns 11
+
+# Another way to call functions is with keyword arguments
+add(y=6, x=5)   # Keyword arguments can arrive in any order.
+
+
+# You can define functions that take a variable number of
+# positional arguments
+def varargs(*args):
+    return args
+
+varargs(1, 2, 3)   # => (1, 2, 3)
+
+
+# You can define functions that take a variable number of
+# keyword arguments, as well
+def keyword_args(**kwargs):
+    return kwargs
+
+# Let's call it to see what happens
+keyword_args(big="foot", loch="ness")   # => {"big": "foot", "loch": "ness"}
+
+
+# You can do both at once, if you like
+def all_the_args(*args, **kwargs):
+    print(args)
+    print(kwargs)
+"""
+all_the_args(1, 2, a=3, b=4) prints:
+    (1, 2)
+    {"a": 3, "b": 4}
+"""
+
+# When calling functions, you can do the opposite of args/kwargs!
+# Use * to expand tuples and use ** to expand kwargs.
+args = (1, 2, 3, 4)
+kwargs = {"a": 3, "b": 4}
+all_the_args(*args)   # equivalent to foo(1, 2, 3, 4)
+all_the_args(**kwargs)   # equivalent to foo(a=3, b=4)
+all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
+
+
+# Python has first class functions
+def create_adder(x):
+    def adder(y):
+        return x + y
+    return adder
+
+add_10 = create_adder(10)
+add_10(3)   # => 13
+
+# There are also anonymous functions
+(lambda x: x > 2)(3)   # => True
+
+# TODO - Fix for iterables
+# There are built-in higher order functions
+map(add_10, [1, 2, 3])   # => [11, 12, 13]
+filter(lambda x: x > 5, [3, 4, 5, 6, 7])   # => [6, 7]
+
+# We can use list comprehensions for nice maps and filters
+[add_10(i) for i in [1, 2, 3]]  # => [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5]   # => [6, 7]
+
+####################################################
+## 5. Classes
+####################################################
+
+
+# We subclass from object to get a class.
+class Human(object):
+
+    # A class attribute. It is shared by all instances of this class
+    species = "H. sapiens"
+
+    # Basic initializer
+    def __init__(self, name):
+        # Assign the argument to the instance's name attribute
+        self.name = name
+
+    # An instance method. All methods take "self" as the first argument
+    def say(self, msg):
+        return "{name}: {message}" % (name=self.name, message=msg)
+
+    # A class method is shared among all instances
+    # They are called with the calling class as the first argument
+    @classmethod
+    def get_species(cls):
+        return cls.species
+
+    # A static method is called without a class or instance reference
+    @staticmethod
+    def grunt():
+        return "*grunt*"
+
+
+# Instantiate a class
+i = Human(name="Ian")
+print(i.say("hi"))     # prints out "Ian: hi"
+
+j = Human("Joel")
+print(j.say("hello"))  # prints out "Joel: hello"
+
+# Call our class method
+i.get_species()   # => "H. sapiens"
+
+# Change the shared attribute
+Human.species = "H. neanderthalensis"
+i.get_species()   # => "H. neanderthalensis"
+j.get_species()   # => "H. neanderthalensis"
+
+# Call the static method
+Human.grunt()   # => "*grunt*"
+
+
+####################################################
+## 6. Modules
+####################################################
+
+# You can import modules
+import math
+print(math.sqrt(16))  # => 4
+
+# You can get specific functions from a module
+from math import ceil, floor
+print(ceil(3.7))  # => 4.0
+print(floor(3.7))   # => 3.0
+
+# You can import all functions from a module.
+# Warning: this is not recommended
+from math import *
+
+# You can shorten module names
+import math as m
+math.sqrt(16) == m.sqrt(16)   # => True
+
+# Python modules are just ordinary python files. You
+# can write your own, and import them. The name of the
+# module is the same as the name of the file.
+
+# You can find out which functions and attributes
+# defines a module.
+import math
+dir(math)
+
+
+####################################################
+## 7. Advanced
+####################################################
+
+# Generators help you make lazy code
+def double_numbers(iterable):
+    for i in iterable:
+        yield i + i
+
+# A generator creates values on the fly.
+# Instead of generating and returning all values at once it creates one in each
+# iteration.  This means values bigger than 15 wont be processed in
+# double_numbers.
+# Note range is a generator too. Creating a list 1-900000000 would take lot of
+# time to be made
+_range = range(1, 900000000)
+# will double all numbers until a result >=30 found
+for i in double_numbers(_range):
+    print(i)
+    if i >= 30:
+        break
+
+
+# Decorators
+# in this example beg wraps say
+# Beg will call say. If say_please is True then it will change the returned
+# message
+from functools import wraps
+
+
+def beg(_say):
+    @wraps(_say)
+    def wrapper(*args, **kwargs):
+        msg, say_please = _say(*args, **kwargs)
+        if say_please:
+            return "{} {}".format(msg, "Please! I am poor :(")
+        return msg
+
+    return wrapper
+
+
+@beg
+def say(say_please=False):
+    msg = "Can you buy me a beer?"
+    return msg, say_please
+
+
+print(say())  # Can you buy me a beer?
+print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
+```
+
+## Ready For More?
+
+### Free Online
+
+* [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+* [Dive Into Python](http://www.diveintopython.net/)
+* [Ideas for Python Projects](http://pythonpracticeprojects.com)
+
+* [The Official Docs](http://docs.python.org/2.6/)
+* [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
+* [Python Module of the Week](http://pymotw.com/2/)
+* [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
+
+### Dead Tree
+
+* [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
+* [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
+* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)
+
-- 
cgit v1.2.3


From a4e05441673bddea21a336920f12d9c659d4900f Mon Sep 17 00:00:00 2001
From: Adam Bard <github@adambard.com>
Date: Sat, 3 May 2014 22:46:28 -0230
Subject: Update python->python3 so things don't get mixed up.

---
 python3.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 3a1bc1c3..54f425ed 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -1,8 +1,8 @@
 ---
-language: python
+language: python3
 contributors:
     - ["Louie Dinh", "http://pythonpracticeprojects.com"]
-filename: learnpython.py
+filename: learnpython3.py
 ---
 
 Python was created by Guido Van Rossum in the early 90's. It is now one of the most popular
-- 
cgit v1.2.3


From 7487e48d0357b7b383ae999d1b01e426dd6d6959 Mon Sep 17 00:00:00 2001
From: hirohope <hiro.hope@gmail.com>
Date: Sun, 18 May 2014 22:58:35 -0400
Subject: typo fixes and version in docs

---
 python3.html.markdown | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 54f425ed..77811535 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -318,7 +318,7 @@ except IndexError as e:
 
 
 # Python's offers a fundamental abstraction called the Iterable.
-# An iterable is an object that can be treated as a sequence. 
+# An iterable is an object that can be treated as a sequence.
 # The object returned the range function, is an iterable.
 
 filled_dict = {"one": 1, "two": 2, "three": 3}
@@ -336,7 +336,7 @@ our_iterable[1]  # Raises a TypeError
 our_iterator = iter(our_iterable)
 
 # Our iterator is an object that can remember the state as we traverse through it.
-# We get the next object by calling the __next__ function. 
+# We get the next object by calling the __next__ function.
 our_iterator.__next__()  #=> "one"
 
 # It maintains state as we call __next__.
@@ -357,7 +357,7 @@ list(filled_dict.keys())  #=> Returns ["one", "two", "three"]
 
 # Use "def" to create new functions
 def add(x, y):
-    print("x is %s and y is %s" % (x, y))
+    print("x is {} and y is {}".format(x, y))
     return x + y    # Return values with a return statement
 
 # Calling functions with parameters
@@ -565,9 +565,9 @@ print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
 * [Dive Into Python](http://www.diveintopython.net/)
 * [Ideas for Python Projects](http://pythonpracticeprojects.com)
 
-* [The Official Docs](http://docs.python.org/2.6/)
+* [The Official Docs](http://docs.python.org/3/)
 * [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
-* [Python Module of the Week](http://pymotw.com/2/)
+* [Python Module of the Week](http://pymotw.com/3/)
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
 
 ### Dead Tree
-- 
cgit v1.2.3


From 9f2929605470ba40b5dfe717554972f18f497826 Mon Sep 17 00:00:00 2001
From: Steven Basart <xksteven@users.noreply.github.com>
Date: Mon, 16 Jun 2014 14:47:43 -0400
Subject: Update python3.html.markdown

fixed python 3 english sets error and editted .add comment because .add only accepts one argument
---
 python3.html.markdown | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 77811535..778076f8 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -238,7 +238,10 @@ empty_set = set()
 # Initialize a set with a bunch of values. Yeah, it looks a bit like a dict. Sorry.
 some_set = {1, 1, 2, 2, 3, 4}   # some_set is now {1, 2, 3, 4}
 
-# Add more items to a set
+#Can set new variables to a set
+filled_set = some_set
+
+# Add one more item to the set 
 filled_set.add(5)   # filled_set is now {1, 2, 3, 4, 5}
 
 # Do set intersection with &
-- 
cgit v1.2.3


From bdbff25c5850e41552e5fc517c99fe3933dc591c Mon Sep 17 00:00:00 2001
From: Steven Basart <xksteven@users.noreply.github.com>
Date: Sun, 13 Jul 2014 14:08:12 -0400
Subject: [python3/en] added int div, modulo, and scoping

Added integer or truncation division, the modulo operator which were missing from operators section. Added function scoping in the functions section.
---
 python3.html.markdown | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 778076f8..eca49862 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -2,6 +2,7 @@
 language: python3
 contributors:
     - ["Louie Dinh", "http://pythonpracticeprojects.com"]
+    - ["Steven Basart", "http://sbasart.com"]
 filename: learnpython3.py
 ---
 
@@ -37,9 +38,16 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 # Except division which returns floats by default
 35 / 5  # => 7.0
 
+# Truncation or Integer division 
+5 // 3     # => 1
+5.0 // 3.0 # => 1.0
+
 # When you use a float, results are floats
 3 * 2.0 # => 6.0
 
+# Modulo operation
+7 % 3 # => 1
+
 # Enforce precedence with parentheses
 (1 + 3) * 2  # => 8
 
@@ -406,6 +414,24 @@ all_the_args(**kwargs)   # equivalent to foo(a=3, b=4)
 all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
 
 
+# Function Scope                                                                
+x = 5
+
+def setX(num):
+    # Local var x not the same as global variable x
+    x = num # => 43
+    print (x) # => 43
+    
+def setGlobalX(num):
+    global x
+    print (x) # => 5
+    x = num # global var x is now set to 6
+    print (x)
+
+setX(43)
+setGlobalX(6)
+
+
 # Python has first class functions
 def create_adder(x):
     def adder(y):
-- 
cgit v1.2.3


From 42c93bf407d91cdb549ef5053c3db7f4a58bcd7e Mon Sep 17 00:00:00 2001
From: Steven Basart <xksteven@users.noreply.github.com>
Date: Sun, 13 Jul 2014 14:45:14 -0400
Subject: [python3/en] added int div, modulo, and scoping

Added integer or truncation division, the modulo operator which were missing from operators section. Added function scoping in the functions section.
---
 python3.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index eca49862..8d9b8e77 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -426,7 +426,7 @@ def setGlobalX(num):
     global x
     print (x) # => 5
     x = num # global var x is now set to 6
-    print (x)
+    print (x) # => 6
 
 setX(43)
 setGlobalX(6)
-- 
cgit v1.2.3


From f08663db5cd965924e0fb4f344dea5c7ada9057e Mon Sep 17 00:00:00 2001
From: Steven Basart <xksteven@users.noreply.github.com>
Date: Sun, 13 Jul 2014 16:00:28 -0400
Subject: Update python3.html.markdown

---
 python3.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 8d9b8e77..7657295d 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -2,7 +2,7 @@
 language: python3
 contributors:
     - ["Louie Dinh", "http://pythonpracticeprojects.com"]
-    - ["Steven Basart", "http://sbasart.com"]
+    - ["Steven Basart", "http://github.com/xksteven"]
 filename: learnpython3.py
 ---
 
-- 
cgit v1.2.3


From 0654a19b44b290828211372e8148338c4c1d1c23 Mon Sep 17 00:00:00 2001
From: Adam Brenecki <adam@brenecki.id.au>
Date: Tue, 15 Jul 2014 13:30:27 +0930
Subject: [python3/en] Clean up confusion between % and .format()

---
 python3.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 7657295d..43d62e77 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -292,7 +292,7 @@ prints:
     mouse is a mammal
 """
 for animal in ["dog", "cat", "mouse"]:
-    # You can use % to interpolate formatted strings
+    # You can use format() to interpolate formatted strings
     print("{} is a mammal".format(animal))
 
 """
@@ -471,7 +471,7 @@ class Human(object):
 
     # An instance method. All methods take "self" as the first argument
     def say(self, msg):
-        return "{name}: {message}" % (name=self.name, message=msg)
+        return "{name}: {message}".format(name=self.name, message=msg)
 
     # A class method is shared among all instances
     # They are called with the calling class as the first argument
-- 
cgit v1.2.3


From 164cf1ce78bcd96fda2a02addc0217ecdf033b5d Mon Sep 17 00:00:00 2001
From: Adam Brenecki <adam@brenecki.id.au>
Date: Wed, 16 Jul 2014 10:25:03 +0930
Subject: Mention that Python 2.5-style string formatting still works in 3

---
 python3.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 43d62e77..bc0c05bd 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -98,6 +98,10 @@ not False  # => True
 # You can use keywords if you don't want to count.
 "{name} wants to eat {food}".format(name="Bob", food="lasagna") #=> "Bob wants to eat lasagna"
 
+# If your Python 3 code also needs to run on Python 2.5 and below, you can also
+# still use the old style of formatting:
+"%s can be %s the %s way" % ("strings", "interpolated", "old")
+
 
 # None is an object
 None  # => None
-- 
cgit v1.2.3


From abc06a620bcb41d3e59c5f0c969d819294edc78e Mon Sep 17 00:00:00 2001
From: Shashwat986 <chandra.shashwat@gmail.com>
Date: Sun, 3 Aug 2014 21:56:26 +0530
Subject: Update python3.html.markdown

Added more info to try/except. Corrected some trivial bugs.
---
 python3.html.markdown | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index bc0c05bd..531d3b5a 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -330,9 +330,12 @@ try:
     raise IndexError("This is an index error")
 except IndexError as e:
     pass    # Pass is just a no-op. Usually you would do recovery here.
+except (TypeError, NameError):
+    pass    # Multiple exceptions can be handled together, if required.
+else:   # Optional clause to the try/except block. Must follow all except blocks
+    print("All good!")   # Runs only if the code in try raises no exceptions
 
-
-# Python's offers a fundamental abstraction called the Iterable.
+# Python offers a fundamental abstraction called the Iterable.
 # An iterable is an object that can be treated as a sequence.
 # The object returned the range function, is an iterable.
 
@@ -340,7 +343,7 @@ filled_dict = {"one": 1, "two": 2, "three": 3}
 our_iterable = filled_dict.keys()
 print(our_iterable) #=> range(1,10). This is an object that implements our Iterable interface
 
-i We can loop over it.
+# We can loop over it.
 for i in our_iterable:
     print(i)    # Prints one, two, three
 
-- 
cgit v1.2.3


From 57036f128f5e874116729e67d8a77cd763f206d5 Mon Sep 17 00:00:00 2001
From: Evgeniy Ginzburg <Nad.Oby@gmail.com>
Date: Tue, 5 Aug 2014 17:41:28 +0300
Subject: aded negative integer division

---
 python3.html.markdown | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index bc0c05bd..de6d552a 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -38,9 +38,11 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 # Except division which returns floats by default
 35 / 5  # => 7.0
 
-# Truncation or Integer division 
+# Result of integer division truncated down both for positive and negative. 
 5 // 3     # => 1
 5.0 // 3.0 # => 1.0
+-5 // 3  # => -2
+-5.0 // 3.0 # => -2.0
 
 # When you use a float, results are floats
 3 * 2.0 # => 6.0
@@ -51,7 +53,6 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 # Enforce precedence with parentheses
 (1 + 3) * 2  # => 8
 
-
 # Boolean values are primitives
 True
 False
@@ -60,7 +61,6 @@ False
 not True  # => False
 not False  # => True
 
-
 # Equality is ==
 1 == 1  # => True
 2 == 1  # => False
@@ -79,7 +79,6 @@ not False  # => True
 1 < 2 < 3  # => True
 2 < 3 < 2  # => False
 
-
 # Strings are created with " or '
 "This is a string."
 'This is also a string.'
-- 
cgit v1.2.3


From a30c76789e12e9b73278b382c42f2046692cd678 Mon Sep 17 00:00:00 2001
From: "Mikael E. Wikner" <wikner.mikael@gmail.com>
Date: Wed, 6 Aug 2014 00:20:24 +0200
Subject: Added changes to the python3 file aswell

---
 python3.html.markdown | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 531d3b5a..08eeb86b 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -471,7 +471,10 @@ class Human(object):
     # A class attribute. It is shared by all instances of this class
     species = "H. sapiens"
 
-    # Basic initializer
+    # Basic initializer, this is called when this class is instantiated.
+    # Note that the double leading and trailing underscores denote objects
+    # or attributes that are used by python but that live in user-controlled
+    # namespaces. You should not invent such names on your own.
     def __init__(self, name):
         # Assign the argument to the instance's name attribute
         self.name = name
@@ -557,9 +560,11 @@ def double_numbers(iterable):
 # double_numbers.
 # Note range is a generator too. Creating a list 1-900000000 would take lot of
 # time to be made
-_range = range(1, 900000000)
+# We use a trailing underscore in variable names when we want to use a name that 
+# would normally collide with a python keyword
+range_ = range(1, 900000000)
 # will double all numbers until a result >=30 found
-for i in double_numbers(_range):
+for i in double_numbers(range_):
     print(i)
     if i >= 30:
         break
@@ -572,10 +577,10 @@ for i in double_numbers(_range):
 from functools import wraps
 
 
-def beg(_say):
-    @wraps(_say)
+def beg(target_function):
+    @wraps(target_function)
     def wrapper(*args, **kwargs):
-        msg, say_please = _say(*args, **kwargs)
+        msg, say_please = target_function(*args, **kwargs)
         if say_please:
             return "{} {}".format(msg, "Please! I am poor :(")
         return msg
-- 
cgit v1.2.3


From 7bcf65278c28cffd32ef051965c2e6401563acc9 Mon Sep 17 00:00:00 2001
From: Evgeniy Ginzburg <Nad.Oby@gmail.com>
Date: Wed, 6 Aug 2014 23:45:37 +0300
Subject: comment about floats in integer division

---
 python3.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 6e901b6a..dc972196 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -40,7 +40,7 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 
 # Result of integer division truncated down both for positive and negative. 
 5 // 3     # => 1
-5.0 // 3.0 # => 1.0
+5.0 // 3.0 # => 1.0 # works on floats too
 -5 // 3  # => -2
 -5.0 // 3.0 # => -2.0
 
-- 
cgit v1.2.3


From 83b63aab543c2c7ece74f514ef12b1e068f463e4 Mon Sep 17 00:00:00 2001
From: Louie Dinh <LouieDinh@gmail.com>
Date: Thu, 21 Aug 2014 15:38:50 -0700
Subject: Fix a long line.

---
 python3.html.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index b494dc1e..f6babaff 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -93,7 +93,9 @@ not False  # => True
 "{} can be {}".format("strings", "interpolated")
 
 # You can repeat the formatting arguments to save some typing.
-"{0} be nimble, {0} be quick, {0} jump over the {1}".format("Jack", "candle stick") #=> "Jack be nimble, Jack be quick, Jack jump over the candle stick"
+"{0} be nimble, {0} be quick, {0} jump over the {1}".format("Jack", "candle stick")
+#=> "Jack be nimble, Jack be quick, Jack jump over the candle stick"
+
 # You can use keywords if you don't want to count.
 "{name} wants to eat {food}".format(name="Bob", food="lasagna") #=> "Bob wants to eat lasagna"
 
-- 
cgit v1.2.3


From 9a909d6a4a1083a97b54c50de2fb390e76f879c0 Mon Sep 17 00:00:00 2001
From: Steven Basart <xksteven@users.noreply.github.com>
Date: Sun, 7 Sep 2014 02:39:31 -0400
Subject: Added Boolean operators and lowered line lengths

Added Bool operators and and or, and lowered some line lengths.  Also shifted some notes above the code lines to keep with same style and help readability.  Also added a note on list comprehension.  Also added adding to dictionary.
---
 python3.html.markdown | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index f6babaff..c3e2ede5 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -61,6 +61,17 @@ False
 not True  # => False
 not False  # => True
 
+# Boolean Operators
+# Note "and" and "or" are case-sensitive
+True and False #=> False
+False or True #=> True
+
+# Note with ints
+0 and 2 #=> 0
+-5 or 0 #=> -5
+0 == False #=> True 
+2 == True #=> False #only 1 == True #=> True
+
 # Equality is ==
 1 == 1  # => True
 2 == 1  # => False
@@ -127,7 +138,8 @@ bool({}) #=> False
 # Python has a print function
 print("I'm Python. Nice to meet you!")
 
-# No need to declare variables before assigning to them. Convention is to use lower_case_with_underscores
+# No need to declare variables before assigning to them. 
+# Convention is to use lower_case_with_underscores
 some_var = 5
 some_var  # => 5
 
@@ -176,7 +188,8 @@ li[::-1]   # => [3, 4, 2, 1]
 del li[2]   # li is now [1, 2, 3]
 
 # You can add lists
-li + other_li   # => [1, 2, 3, 4, 5, 6] - Note: values for li and for other_li are not modified.
+# Note: values for li and for other_li are not modified.
+li + other_li   # => [1, 2, 3, 4, 5, 6] 
 
 # Concatenate lists with "extend()"
 li.extend(other_li)   # Now li is [1, 2, 3, 4, 5, 6]
@@ -215,14 +228,17 @@ filled_dict = {"one": 1, "two": 2, "three": 3}
 # Look up values with []
 filled_dict["one"]   # => 1
 
-# Get all keys as a list with "keys()". We need to wrap the call in list() because we are getting back an iterable. We'll talk about those later.
-list(filled_dict.keys())   # => ["three", "two", "one"]
+# Get all keys as a list with "keys()". 
+# We need to wrap the call in list() because we are getting back an iterable. We'll talk about those later.
 # Note - Dictionary key ordering is not guaranteed.
 # Your results might not match this exactly.
+list(filled_dict.keys())   # => ["three", "two", "one"]
+
 
 # Get all values as a list with "values()". Once again we need to wrap it in list() to get it out of the iterable.
-list(filled_dict.values())   # => [3, 2, 1]
 # Note - Same as above regarding key ordering.
+list(filled_dict.values())   # => [3, 2, 1]
+
 
 # Check for existence of keys in a dictionary with "in"
 "one" in filled_dict   # => True
@@ -242,6 +258,10 @@ filled_dict.get("four", 4)   # => 4
 filled_dict.setdefault("five", 5)  # filled_dict["five"] is set to 5
 filled_dict.setdefault("five", 6)  # filled_dict["five"] is still 5
 
+# Adding to a dictionary
+filled_dict.update({"four":4}) #=> {"one": 1, "two": 2, "three": 3, "four": 4}
+#filled_dict["four"] = 4  #another way to add to dict
+
 # Remove keys from a dictionary with del
 del filled_dict["one"]  # Removes the key "one" from filled dict
 
@@ -458,6 +478,7 @@ map(add_10, [1, 2, 3])   # => [11, 12, 13]
 filter(lambda x: x > 5, [3, 4, 5, 6, 7])   # => [6, 7]
 
 # We can use list comprehensions for nice maps and filters
+# List comprehension stores the output as a list which can itself be a nested list
 [add_10(i) for i in [1, 2, 3]]  # => [11, 12, 13]
 [x for x in [3, 4, 5, 6, 7] if x > 5]   # => [6, 7]
 
-- 
cgit v1.2.3


From 820eebcd3362841721a981f91695b64af8f50b94 Mon Sep 17 00:00:00 2001
From: Steven Basart <xksteven@users.noreply.github.com>
Date: Sun, 7 Sep 2014 19:23:07 -0400
Subject: [python3/en] Bool operators

Bool operators
---
 python3.html.markdown | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index c3e2ede5..a94f4eae 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -66,11 +66,12 @@ not False  # => True
 True and False #=> False
 False or True #=> True
 
-# Note with ints
+# Note using Bool operators with ints
 0 and 2 #=> 0
 -5 or 0 #=> -5
 0 == False #=> True 
-2 == True #=> False #only 1 == True #=> True
+2 == True #=> False 
+1 == True #=> True
 
 # Equality is ==
 1 == 1  # => True
-- 
cgit v1.2.3


From 39d8753d5285348b998a7b87ae68614acf816df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=20Polykanine=20A=2EK=2EA=2E=20Menelion=20Elens=C3=BA?=
 =?UTF-8?q?l=C3=AB?= <andre@oire.org>
Date: Thu, 9 Oct 2014 22:49:47 +0300
Subject: [python/en] Adding exponentiation operator

---
 python3.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index a94f4eae..6fce9bf7 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -3,6 +3,7 @@ language: python3
 contributors:
     - ["Louie Dinh", "http://pythonpracticeprojects.com"]
     - ["Steven Basart", "http://github.com/xksteven"]
+    - ["Andre Polykanine", "https://github.com/Oire"]
 filename: learnpython3.py
 ---
 
@@ -50,6 +51,9 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 # Modulo operation
 7 % 3 # => 1
 
+# Exponentiation (x to the y'th power)
+2 ** 4 # => 16
+
 # Enforce precedence with parentheses
 (1 + 3) * 2  # => 8
 
-- 
cgit v1.2.3


From 68c9aed1346fe20df741014de415f4297460dc67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=20Polykanine=20A=2EK=2EA=2E=20Menelion=20Elens=C3=BA?=
 =?UTF-8?q?l=C3=AB?= <andre@oire.org>
Date: Thu, 9 Oct 2014 23:06:24 +0300
Subject: Corrected as per @iirelu's comment

---
 python3.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 6fce9bf7..e478e57f 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -52,7 +52,7 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 7 % 3 # => 1
 
 # Exponentiation (x to the y'th power)
-2 ** 4 # => 16
+2**4 # => 16
 
 # Enforce precedence with parentheses
 (1 + 3) * 2  # => 8
-- 
cgit v1.2.3


From 38cf765079a3bd7ea8a2493857b7d2bc26d5fe30 Mon Sep 17 00:00:00 2001
From: Jack Hooper <jackhooper@users.noreply.github.com>
Date: Wed, 12 Nov 2014 02:04:50 +1100
Subject: Apostrophe fixes as per Python 2 tutorial

---
 python3.html.markdown | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index e478e57f..0b4feccc 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -7,7 +7,7 @@ contributors:
 filename: learnpython3.py
 ---
 
-Python was created by Guido Van Rossum in the early 90's. It is now one of the most popular
+Python was created by Guido Van Rossum in the early 90s. It is now one of the most popular
 languages in existence. I fell in love with Python for its syntactic clarity. It's basically
 executable pseudocode.
 
@@ -20,7 +20,7 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 # Single line comments start with a number symbol.
 
 """ Multiline strings can be written
-    using three "'s, and are often used
+    using three "s, and are often used
     as comments
 """
 
@@ -51,7 +51,7 @@ Note: This article applies to Python 3 specifically. Check out the other tutoria
 # Modulo operation
 7 % 3 # => 1
 
-# Exponentiation (x to the y'th power)
+# Exponentiation (x to the yth power)
 2**4 # => 16
 
 # Enforce precedence with parentheses
-- 
cgit v1.2.3


From 674284cfcb0fa3194ad854d711288ec9aa5b98e9 Mon Sep 17 00:00:00 2001
From: maniexx <maniexx@users.noreply.github.com>
Date: Mon, 22 Dec 2014 15:24:09 +0100
Subject: Delete PYMOTW3 due to lack of content

---
 python3.html.markdown | 1 -
 1 file changed, 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index f6babaff..8bcc85d1 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -609,7 +609,6 @@ print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
 
 * [The Official Docs](http://docs.python.org/3/)
 * [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
-* [Python Module of the Week](http://pymotw.com/3/)
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
 
 ### Dead Tree
-- 
cgit v1.2.3


From f4bd1bc8b462e09330ae22ae89a72c11354aa8ac Mon Sep 17 00:00:00 2001
From: suuuzi <tetestonaldo@gmail.com>
Date: Wed, 4 Feb 2015 15:32:55 -0200
Subject: Python 3: Changing 'the other tutorial' to a link refering the other
 tutorial

---
 python3.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 6b1d3156..0293d7d2 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -13,7 +13,7 @@ executable pseudocode.
 
 Feedback would be highly appreciated! You can reach me at [@louiedinh](http://twitter.com/louiedinh) or louiedinh [at] [google's email service]
 
-Note: This article applies to Python 3 specifically. Check out the other tutorial if you want to learn the old Python 2.7
+Note: This article applies to Python 3 specifically. Check out [here](http://learnxinyminutes.com/docs/python/) if you want to learn the old Python 2.7
 
 ```python
 
-- 
cgit v1.2.3


From 7e7a60d47ce0113e1a5b4ee8642984c60a08f569 Mon Sep 17 00:00:00 2001
From: Cornel Punga <cornel.punga@gmail.com>
Date: Tue, 24 Mar 2015 12:29:01 +0200
Subject: Update python3.html.markdown. Changes to spacing and online resources

1. Some changes related to spacing
2. Added an online resource
---
 python3.html.markdown | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 0293d7d2..e8913267 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -276,7 +276,7 @@ empty_set = set()
 # Initialize a set with a bunch of values. Yeah, it looks a bit like a dict. Sorry.
 some_set = {1, 1, 2, 2, 3, 4}   # some_set is now {1, 2, 3, 4}
 
-#Can set new variables to a set
+# Can set new variables to a set
 filled_set = some_set
 
 # Add one more item to the set 
@@ -394,7 +394,6 @@ our_iterator.__next__() # Raises StopIteration
 list(filled_dict.keys())  #=> Returns ["one", "two", "three"]
 
 
-
 ####################################################
 ## 4. Functions
 ####################################################
@@ -410,7 +409,6 @@ add(5, 6)   # => prints out "x is 5 and y is 6" and returns 11
 # Another way to call functions is with keyword arguments
 add(y=6, x=5)   # Keyword arguments can arrive in any order.
 
-
 # You can define functions that take a variable number of
 # positional arguments
 def varargs(*args):
@@ -418,7 +416,6 @@ def varargs(*args):
 
 varargs(1, 2, 3)   # => (1, 2, 3)
 
-
 # You can define functions that take a variable number of
 # keyword arguments, as well
 def keyword_args(**kwargs):
@@ -636,6 +633,7 @@ print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
 * [The Official Docs](http://docs.python.org/3/)
 * [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
+* [Python Course](http://www.python-course.eu/index.php)
 
 ### Dead Tree
 
-- 
cgit v1.2.3


From 44c37d5531d42a73b0bde49525e586b413489caf Mon Sep 17 00:00:00 2001
From: Cornel Punga <cornel.punga@gmail.com>
Date: Tue, 24 Mar 2015 19:26:19 +0200
Subject: [python3.html.mardown] Added a short statement about magic methods

Terminology related to Python special functions
---
 python3.html.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index e8913267..56126ad3 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -498,7 +498,9 @@ class Human(object):
     # Basic initializer, this is called when this class is instantiated.
     # Note that the double leading and trailing underscores denote objects
     # or attributes that are used by python but that live in user-controlled
-    # namespaces. You should not invent such names on your own.
+    # namespaces. Methods(or objects or attributes) like: __init__, __str__, 
+    # __repr__ etc. are called magic methods (or sometimes called dunder methods)  
+    # You should not invent such names on your own.
     def __init__(self, name):
         # Assign the argument to the instance's name attribute
         self.name = name
-- 
cgit v1.2.3


From d20eb1fb94c819283e610bbd9f1cf3cea834da46 Mon Sep 17 00:00:00 2001
From: Sriram Sundarraj <sriram.s.1994@gmail.com>
Date: Thu, 23 Apr 2015 01:48:18 +0530
Subject: Adding strings without + added.

---
 python3.html.markdown | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 56126ad3..6c5e1059 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -101,6 +101,8 @@ False or True #=> True
 
 # Strings can be added too! But try not to do this.
 "Hello " + "world!"  # => "Hello world!"
+# Strings can be added without using '+'
+"Hello " "world!"  # => "Hello world!"
 
 # A string can be treated like a list of characters
 "This is a string"[0]  # => 'T'
-- 
cgit v1.2.3


From 8cfb7ba02f7d53b6b33ff5e776289ee4fcb48618 Mon Sep 17 00:00:00 2001
From: Sriram Sundarraj <sriram.s.1994@gmail.com>
Date: Thu, 23 Apr 2015 02:06:43 +0530
Subject: [python/en] Range function arguments. Range function with start and
 stop.

---
 python3.html.markdown | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 6c5e1059..470eb6e4 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -339,6 +339,18 @@ prints:
 for i in range(4):
     print(i)
 
+"""
+"range(lower, upper)" returns a list of numbers
+from the lower number to the upper number
+prints:
+    4
+    5
+    6
+    7
+"""
+for i in range(4, 8):
+    print(i)
+
 """
 While loops go until a condition is no longer met.
 prints:
-- 
cgit v1.2.3


From ffc5ac247c52071c3e4e639ecd363c4fca89bec9 Mon Sep 17 00:00:00 2001
From: Geoff Liu <g@geoffliu.me>
Date: Thu, 30 Apr 2015 23:44:09 -0600
Subject: Python3 doc cleanup

---
 python3.html.markdown | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 470eb6e4..a112912f 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -39,7 +39,7 @@ Note: This article applies to Python 3 specifically. Check out [here](http://lea
 # Except division which returns floats by default
 35 / 5  # => 7.0
 
-# Result of integer division truncated down both for positive and negative. 
+# Result of integer division truncated down both for positive and negative.
 5 // 3     # => 1
 5.0 // 3.0 # => 1.0 # works on floats too
 -5 // 3  # => -2
@@ -73,8 +73,8 @@ False or True #=> True
 # Note using Bool operators with ints
 0 and 2 #=> 0
 -5 or 0 #=> -5
-0 == False #=> True 
-2 == True #=> False 
+0 == False #=> True
+2 == True #=> False
 1 == True #=> True
 
 # Equality is ==
@@ -145,7 +145,7 @@ bool({}) #=> False
 # Python has a print function
 print("I'm Python. Nice to meet you!")
 
-# No need to declare variables before assigning to them. 
+# No need to declare variables before assigning to them.
 # Convention is to use lower_case_with_underscores
 some_var = 5
 some_var  # => 5
@@ -186,7 +186,7 @@ li[2:]  # => [4, 3]
 li[:3]  # => [1, 2, 4]
 # Select every second entry
 li[::2]   # =>[1, 4]
-# Revert the list
+# Return a reversed copy of the list
 li[::-1]   # => [3, 4, 2, 1]
 # Use any combination of these to make advanced slices
 # li[start:end:step]
@@ -196,7 +196,7 @@ del li[2]   # li is now [1, 2, 3]
 
 # You can add lists
 # Note: values for li and for other_li are not modified.
-li + other_li   # => [1, 2, 3, 4, 5, 6] 
+li + other_li   # => [1, 2, 3, 4, 5, 6]
 
 # Concatenate lists with "extend()"
 li.extend(other_li)   # Now li is [1, 2, 3, 4, 5, 6]
@@ -213,7 +213,7 @@ tup = (1, 2, 3)
 tup[0]   # => 1
 tup[0] = 3  # Raises a TypeError
 
-# You can do all those list thingies on tuples too
+# You can do most of the list operations on tuples too
 len(tup)   # => 3
 tup + (4, 5, 6)   # => (1, 2, 3, 4, 5, 6)
 tup[:2]   # => (1, 2)
@@ -235,15 +235,15 @@ filled_dict = {"one": 1, "two": 2, "three": 3}
 # Look up values with []
 filled_dict["one"]   # => 1
 
-# Get all keys as a list with "keys()". 
-# We need to wrap the call in list() because we are getting back an iterable. We'll talk about those later.
-# Note - Dictionary key ordering is not guaranteed.
-# Your results might not match this exactly.
+# Get all keys as an iterable with "keys()". We need to wrap the call in list()
+# to turn it into a list. We'll talk about those later.  Note - Dictionary key
+# ordering is not guaranteed. Your results might not match this exactly.
 list(filled_dict.keys())   # => ["three", "two", "one"]
 
 
-# Get all values as a list with "values()". Once again we need to wrap it in list() to get it out of the iterable.
-# Note - Same as above regarding key ordering.
+# Get all values as an iterable with "values()". Once again we need to wrap it
+# in list() to get it out of the iterable. Note - Same as above regarding key
+# ordering.
 list(filled_dict.values())   # => [3, 2, 1]
 
 
@@ -281,7 +281,7 @@ some_set = {1, 1, 2, 2, 3, 4}   # some_set is now {1, 2, 3, 4}
 # Can set new variables to a set
 filled_set = some_set
 
-# Add one more item to the set 
+# Add one more item to the set
 filled_set.add(5)   # filled_set is now {1, 2, 3, 4, 5}
 
 # Do set intersection with &
@@ -328,7 +328,7 @@ for animal in ["dog", "cat", "mouse"]:
     print("{} is a mammal".format(animal))
 
 """
-"range(number)" returns a list of numbers
+"range(number)" returns an iterable of numbers
 from zero to the given number
 prints:
     0
@@ -340,7 +340,7 @@ for i in range(4):
     print(i)
 
 """
-"range(lower, upper)" returns a list of numbers
+"range(lower, upper)" returns an iterable of numbers
 from the lower number to the upper number
 prints:
     4
@@ -458,14 +458,14 @@ all_the_args(**kwargs)   # equivalent to foo(a=3, b=4)
 all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
 
 
-# Function Scope                                                                
+# Function Scope
 x = 5
 
 def setX(num):
     # Local var x not the same as global variable x
     x = num # => 43
     print (x) # => 43
-    
+
 def setGlobalX(num):
     global x
     print (x) # => 5
@@ -512,8 +512,8 @@ class Human(object):
     # Basic initializer, this is called when this class is instantiated.
     # Note that the double leading and trailing underscores denote objects
     # or attributes that are used by python but that live in user-controlled
-    # namespaces. Methods(or objects or attributes) like: __init__, __str__, 
-    # __repr__ etc. are called magic methods (or sometimes called dunder methods)  
+    # namespaces. Methods(or objects or attributes) like: __init__, __str__,
+    # __repr__ etc. are called magic methods (or sometimes called dunder methods)
     # You should not invent such names on your own.
     def __init__(self, name):
         # Assign the argument to the instance's name attribute
@@ -600,7 +600,7 @@ def double_numbers(iterable):
 # double_numbers.
 # Note range is a generator too. Creating a list 1-900000000 would take lot of
 # time to be made
-# We use a trailing underscore in variable names when we want to use a name that 
+# We use a trailing underscore in variable names when we want to use a name that
 # would normally collide with a python keyword
 range_ = range(1, 900000000)
 # will double all numbers until a result >=30 found
-- 
cgit v1.2.3


From 55f9ff0654f6489aa53e3a799af2dd462fa9c5c8 Mon Sep 17 00:00:00 2001
From: Michael Herman <hermanmu@gmail.com>
Date: Sun, 5 Jul 2015 08:36:51 -0600
Subject: python/en - added two resources

---
 python3.html.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index a112912f..9369a3ad 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -645,15 +645,16 @@ print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
 * [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
 * [Dive Into Python](http://www.diveintopython.net/)
 * [Ideas for Python Projects](http://pythonpracticeprojects.com)
-
 * [The Official Docs](http://docs.python.org/3/)
 * [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
 * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182)
 * [Python Course](http://www.python-course.eu/index.php)
+* [First Steps With Python](https://realpython.com/learn/python-first-steps/)
 
 ### Dead Tree
 
 * [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
 * [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
 * [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)
+* [Real Python](https://realpython.com/)
 
-- 
cgit v1.2.3


From 5b66758d761afceb797ae0f21d5c99351d29361e Mon Sep 17 00:00:00 2001
From: Michael Herman <hermanmu@gmail.com>
Date: Sun, 5 Jul 2015 21:12:58 -0600
Subject: Update python3.html.markdown

---
 python3.html.markdown | 2 --
 1 file changed, 2 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 9369a3ad..dd57bf58 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -656,5 +656,3 @@ print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
 * [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
 * [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
 * [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)
-* [Real Python](https://realpython.com/)
-
-- 
cgit v1.2.3


From 8a968db2bc0f596e2e9d865b73d909b02ff774d6 Mon Sep 17 00:00:00 2001
From: Al Sweigart <asweigart@gmail.com>
Date: Thu, 23 Jul 2015 11:24:40 -0700
Subject: Added links to the free book "Automate the Boring Stuff with Python"
 to the "Free Online" section.

---
 python3.html.markdown | 1 +
 1 file changed, 1 insertion(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index dd57bf58..36298566 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -642,6 +642,7 @@ print(say(say_please=True))  # Can you buy me a beer? Please! I am poor :(
 
 ### Free Online
 
+* [Automate the Boring Stuff with Python](https://automatetheboringstuff.com)
 * [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
 * [Dive Into Python](http://www.diveintopython.net/)
 * [Ideas for Python Projects](http://pythonpracticeprojects.com)
-- 
cgit v1.2.3


From ac2dfe7dc782cf1663944c0de48f6bbe810a56d8 Mon Sep 17 00:00:00 2001
From: Genki Marshall <genkimarshall@gmail.com>
Date: Fri, 24 Jul 2015 13:21:01 -0700
Subject: [python3/en] Use `next()` instead of `__next__()`

Fixes issue #1148.
The reasoning is well explained by the issue. One can also refer to the
docs [0], showing it is more idiomatic to use `next()`.

[0]: https://www.python.org/dev/peps/pep-3114/
     #double-underscore-methods-and-built-in-functions
---
 python3.html.markdown | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 36298566..9d965fb1 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -394,15 +394,15 @@ our_iterable[1]  # Raises a TypeError
 our_iterator = iter(our_iterable)
 
 # Our iterator is an object that can remember the state as we traverse through it.
-# We get the next object by calling the __next__ function.
-our_iterator.__next__()  #=> "one"
+# We get the next object with "next()".
+next(our_iterator)  #=> "one"
 
-# It maintains state as we call __next__.
-our_iterator.__next__()  #=> "two"
-our_iterator.__next__()  #=> "three"
+# It maintains state as we iterate.
+next(our_iterator)  #=> "two"
+next(our_iterator)  #=> "three"
 
 # After the iterator has returned all of its data, it gives you a StopIterator Exception
-our_iterator.__next__() # Raises StopIteration
+next(our_iterator) # Raises StopIteration
 
 # You can grab all the elements of an iterator by calling list() on it.
 list(filled_dict.keys())  #=> Returns ["one", "two", "three"]
-- 
cgit v1.2.3


From 1b767166e112aa4cbd9758ac722f2286b534803f Mon Sep 17 00:00:00 2001
From: Denis Gladkikh <denis@gladkikh.email>
Date: Tue, 1 Sep 2015 10:25:04 -0700
Subject: Python3: add finally and with statements

---
 python3.html.markdown | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 9d965fb1..fbed77fe 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -374,6 +374,13 @@ except (TypeError, NameError):
     pass    # Multiple exceptions can be handled together, if required.
 else:   # Optional clause to the try/except block. Must follow all except blocks
     print("All good!")   # Runs only if the code in try raises no exceptions
+finally: #  Execute under all circumstances
+    print "We can clean up resources here"
+ 		 
+# Instead of try/finally to cleanup resources you can use a with statement
+with open("myfile.txt") as f:
+    for line in f:
+        print line
 
 # Python offers a fundamental abstraction called the Iterable.
 # An iterable is an object that can be treated as a sequence.
-- 
cgit v1.2.3


From 11749e1ba0ac173dd609bda6928fa8b8c3421803 Mon Sep 17 00:00:00 2001
From: Foo Chuan Wei <foochuanwei@users.noreply.github.com>
Date: Sat, 5 Sep 2015 11:10:18 +0800
Subject: Corrected Python3 print() function

---
 python3.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index fbed77fe..bd83c90b 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -375,12 +375,12 @@ except (TypeError, NameError):
 else:   # Optional clause to the try/except block. Must follow all except blocks
     print("All good!")   # Runs only if the code in try raises no exceptions
 finally: #  Execute under all circumstances
-    print "We can clean up resources here"
+    print ("We can clean up resources here")
  		 
 # Instead of try/finally to cleanup resources you can use a with statement
 with open("myfile.txt") as f:
     for line in f:
-        print line
+        print (line)
 
 # Python offers a fundamental abstraction called the Iterable.
 # An iterable is an object that can be treated as a sequence.
-- 
cgit v1.2.3


From 1ccebdf972dd000299f48689e3c1b756761fdb64 Mon Sep 17 00:00:00 2001
From: Foo Chuan Wei <foochuanwei@users.noreply.github.com>
Date: Sat, 5 Sep 2015 21:26:22 +0800
Subject: Update python3.html.markdown

---
 python3.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index bd83c90b..b3acb122 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -375,12 +375,12 @@ except (TypeError, NameError):
 else:   # Optional clause to the try/except block. Must follow all except blocks
     print("All good!")   # Runs only if the code in try raises no exceptions
 finally: #  Execute under all circumstances
-    print ("We can clean up resources here")
+    print("We can clean up resources here")
  		 
 # Instead of try/finally to cleanup resources you can use a with statement
 with open("myfile.txt") as f:
     for line in f:
-        print (line)
+        print(line)
 
 # Python offers a fundamental abstraction called the Iterable.
 # An iterable is an object that can be treated as a sequence.
-- 
cgit v1.2.3


From 7184d7b61d99d2de93e19edb129ea3d17809be7f Mon Sep 17 00:00:00 2001
From: Zachary Ferguson <zfergus2@users.noreply.github.com>
Date: Fri, 2 Oct 2015 17:24:36 -0400
Subject: Changed [python3/en]

Compared is and ==.
Noted that tuples of length 1 require an ending
comma.
Discussed that keys of dictionaries have to be immutable.
Added
that elements of a set have to be immutable.
Included an explanation of
returning multiple values with tuple assignments.
Added some clarifying
remarks to comments.
---
 python3.html.markdown | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index b3acb122..d70c5462 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -4,6 +4,7 @@ contributors:
     - ["Louie Dinh", "http://pythonpracticeprojects.com"]
     - ["Steven Basart", "http://github.com/xksteven"]
     - ["Andre Polykanine", "https://github.com/Oire"]
+	- ["Zachary Ferguson", "http://github.com/zfergus2"]
 filename: learnpython3.py
 ---
 
@@ -36,7 +37,7 @@ Note: This article applies to Python 3 specifically. Check out [here](http://lea
 8 - 1  # => 7
 10 * 2  # => 20
 
-# Except division which returns floats by default
+# Except division which returns floats, real numbers, by default
 35 / 5  # => 7.0
 
 # Result of integer division truncated down both for positive and negative.
@@ -51,13 +52,13 @@ Note: This article applies to Python 3 specifically. Check out [here](http://lea
 # Modulo operation
 7 % 3 # => 1
 
-# Exponentiation (x to the yth power)
+# Exponentiation (x**y, x to the yth power)
 2**4 # => 16
 
 # Enforce precedence with parentheses
 (1 + 3) * 2  # => 8
 
-# Boolean values are primitives
+# Boolean values are primitives (Note: the capitalization)
 True
 False
 
@@ -95,6 +96,16 @@ False or True #=> True
 1 < 2 < 3  # => True
 2 < 3 < 2  # => False
 
+# (is vs. ==) is checks if two variable refer to the same object, but == checks 
+# if the objects pointed to have the same values.
+a = [1, 2, 3, 4] # Point a at a new list, [1, 2, 3, 4]
+b = a # Point b at what a is pointing to
+b is a # => True, a and b refer to the same object
+b == a # => True, a's and b's objects are equal
+b = [1, 2, 3, 4] # Point a at a new list, [1, 2, 3, 4]
+b is a # => False, a and b do not refer to the same object
+b == a # => True, a's and b's objects are equal
+
 # Strings are created with " or '
 "This is a string."
 'This is also a string.'
@@ -145,6 +156,10 @@ bool({}) #=> False
 # Python has a print function
 print("I'm Python. Nice to meet you!")
 
+# By default the print function also prints out a newline at the end.
+# Use the optional argument end to change the end character.
+print("I'm Python. Nice to meet you!", end="")
+
 # No need to declare variables before assigning to them.
 # Convention is to use lower_case_with_underscores
 some_var = 5
@@ -191,6 +206,9 @@ li[::-1]   # => [3, 4, 2, 1]
 # Use any combination of these to make advanced slices
 # li[start:end:step]
 
+# Make a one layer deep copy using slices
+li2 = li[:] # => li2 = [1, 2, 4, 3] but (li2 is li) will result in false.
+
 # Remove arbitrary elements from a list with "del"
 del li[2]   # li is now [1, 2, 3]
 
@@ -213,6 +231,12 @@ tup = (1, 2, 3)
 tup[0]   # => 1
 tup[0] = 3  # Raises a TypeError
 
+# Note that a tuple of length one has to have a comma after the last element but
+# tuples of other lengths, even zero, do not.
+type((1))  # => <class 'int'>
+type((1,)) # => <class 'tuple'>
+type(())   # => <class 'tuple'>
+
 # You can do most of the list operations on tuples too
 len(tup)   # => 3
 tup + (4, 5, 6)   # => (1, 2, 3, 4, 5, 6)
@@ -232,6 +256,12 @@ empty_dict = {}
 # Here is a prefilled dictionary
 filled_dict = {"one": 1, "two": 2, "three": 3}
 
+# Note keys for dictionaries have to be immutable types. This is to ensure that 
+# the key can be converted to a constant hash value for quick look-ups. 
+# Immutable types include ints, floats, strings, tuples.
+invalid_dict = {[1,2,3]: "123"} # => Raises a TypeError: unhashable type: 'list'
+valid_dict = {(1,2,3):[1,2,3]}  # Values can be of any type, however.
+
 # Look up values with []
 filled_dict["one"]   # => 1
 
@@ -278,6 +308,10 @@ empty_set = set()
 # Initialize a set with a bunch of values. Yeah, it looks a bit like a dict. Sorry.
 some_set = {1, 1, 2, 2, 3, 4}   # some_set is now {1, 2, 3, 4}
 
+# Similar to keys of a dictionary, elements of a set have to be immutable.
+invalid_set = {[1], 1} # => Raises a TypeError: unhashable type: 'list'
+valid_set = {(1,), 1}
+
 # Can set new variables to a set
 filled_set = some_set
 
@@ -299,6 +333,7 @@ filled_set | other_set   # => {1, 2, 3, 4, 5, 6}
 10 in filled_set   # => False
 
 
+
 ####################################################
 ## 3. Control Flow and Iterables
 ####################################################
@@ -464,6 +499,16 @@ all_the_args(*args)   # equivalent to foo(1, 2, 3, 4)
 all_the_args(**kwargs)   # equivalent to foo(a=3, b=4)
 all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
 
+# Returning multiple values (with tuple assignments)
+def swap(x, y):
+	return y, x   # Return multiple values as a tuple
+				  # (Note: parenthesis have been excluded but can be included)
+#   return (y, x) # Just as valid as the above example.
+	
+x = 1
+y = 2
+x, y = swap(x, y) # => x = 2, y = 1
+# (x, y) = swap(x,y) # Again parenthesis have been excluded but can be included.
 
 # Function Scope
 x = 5
-- 
cgit v1.2.3


From 82bdd1b1c8c5eaa49289d9a683bf87ed85b99be9 Mon Sep 17 00:00:00 2001
From: VeerpalB <VeerpalB@users.noreply.github.com>
Date: Sun, 4 Oct 2015 19:41:13 -0400
Subject: Add step parameter to range function

A description of the step parameter of the range function is added. An example of its use in a for loop is also given.
---
 python3.html.markdown | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index b3acb122..4696ae1c 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -352,6 +352,18 @@ for i in range(4, 8):
     print(i)
 
 """
+"range(lower, upper, step)" returns an iterable of numbers
+from the lower number to the upper number, while incrementing
+by step. If step is not indicated, the default value is 1.
+prints:
+    4
+    6
+    8
+"""
+for i in range(4, 8, 2):
+    print(i)
+"""
+
 While loops go until a condition is no longer met.
 prints:
     0
-- 
cgit v1.2.3


From 52253720456acfef35cbbcf1ea1b3d98816c0961 Mon Sep 17 00:00:00 2001
From: Zachary Ferguson <zfergus2@users.noreply.github.com>
Date: Sun, 4 Oct 2015 19:58:14 -0400
Subject: Fixed whitespaces

Fixed the spacing to conform with standards.
---
 python3.html.markdown | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index d70c5462..7b6edae7 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -4,7 +4,7 @@ contributors:
     - ["Louie Dinh", "http://pythonpracticeprojects.com"]
     - ["Steven Basart", "http://github.com/xksteven"]
     - ["Andre Polykanine", "https://github.com/Oire"]
-	- ["Zachary Ferguson", "http://github.com/zfergus2"]
+    - ["Zachary Ferguson", "http://github.com/zfergus2"]
 filename: learnpython3.py
 ---
 
@@ -158,7 +158,7 @@ print("I'm Python. Nice to meet you!")
 
 # By default the print function also prints out a newline at the end.
 # Use the optional argument end to change the end character.
-print("I'm Python. Nice to meet you!", end="")
+print("Hello, World", end="!") # => Hello, World!
 
 # No need to declare variables before assigning to them.
 # Convention is to use lower_case_with_underscores
@@ -501,10 +501,9 @@ all_the_args(*args, **kwargs)   # equivalent to foo(1, 2, 3, 4, a=3, b=4)
 
 # Returning multiple values (with tuple assignments)
 def swap(x, y):
-	return y, x   # Return multiple values as a tuple
-				  # (Note: parenthesis have been excluded but can be included)
-#   return (y, x) # Just as valid as the above example.
-	
+    return y, x # Return multiple values as a tuple without the parenthesis.
+                # (Note: parenthesis have been excluded but can be included)
+
 x = 1
 y = 2
 x, y = swap(x, y) # => x = 2, y = 1
-- 
cgit v1.2.3


From 960ee4a1856db8eadb96277bb2422edfa8f2a81c Mon Sep 17 00:00:00 2001
From: Gabriel Halley <gabhalley@gmail.com>
Date: Wed, 7 Oct 2015 23:11:24 -0400
Subject: removing whitespace all over

---
 python3.html.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'python3.html.markdown')

diff --git a/python3.html.markdown b/python3.html.markdown
index 971ca0a4..acd6187c 100644
--- a/python3.html.markdown
+++ b/python3.html.markdown
@@ -96,7 +96,7 @@ False or True #=> True
 1 < 2 < 3  # => True
 2 < 3 < 2  # => False
 
-# (is vs. ==) is checks if two variable refer to the same object, but == checks 
+# (is vs. ==) is checks if two variable refer to the same object, but == checks
 # if the objects pointed to have the same values.
 a = [1, 2, 3, 4] # Point a at a new list, [1, 2, 3, 4]
 b = a # Point b at what a is pointing to
@@ -256,8 +256,8 @@ empty_dict = {}
 # Here is a prefilled dictionary
 filled_dict = {"one": 1, "two": 2, "three": 3}
 
-# Note keys for dictionaries have to be immutable types. This is to ensure that 
-# the key can be converted to a constant hash value for quick look-ups. 
+# Note keys for dictionaries have to be immutable types. This is to ensure that
+# the key can be converted to a constant hash value for quick look-ups.
 # Immutable types include ints, floats, strings, tuples.
 invalid_dict = {[1,2,3]: "123"} # => Raises a TypeError: unhashable type: 'list'
 valid_dict = {(1,2,3):[1,2,3]}  # Values can be of any type, however.
@@ -423,7 +423,7 @@ else:   # Optional clause to the try/except block. Must follow all except blocks
     print("All good!")   # Runs only if the code in try raises no exceptions
 finally: #  Execute under all circumstances
     print("We can clean up resources here")
- 		 
+
 # Instead of try/finally to cleanup resources you can use a with statement
 with open("myfile.txt") as f:
     for line in f:
-- 
cgit v1.2.3