diff options
author | Michael Lee <michael.lee.0x2a@gmail.com> | 2013-07-01 06:31:28 -0700 |
---|---|---|
committer | Michael Lee <michael.lee.0x2a@gmail.com> | 2013-07-01 06:31:28 -0700 |
commit | 1665dde88a750b46132131d325e5f3c4a451a4af (patch) | |
tree | 4c91976d34f03f865e400282173226247e013b60 | |
parent | c74780755887d270aebf5563bcfa4449e170dab0 (diff) | |
parent | 79c26e6679948063036675b132a409b855d43cf1 (diff) |
Incorporated feedback, and pulled in changes from the master trunk.
-rw-r--r-- | python.html.markdown | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/python.html.markdown b/python.html.markdown index 9324e29b..e3f04e19 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -173,6 +173,9 @@ li.extend(other_li) # Now li is [1, 2, 3, 4, 5, 6] # Examine the length with len len(li) #=> 6 +# Note: lists can contain arbitrary values +li2 = [1, "Hello", [[], "Hi", 5,]] + # Tuples are like lists but are immutable. tup = (1, 2, 3) tup[0] #=> 1 @@ -376,6 +379,8 @@ add_10(3) #=> 13 # There are also anonymous functions (lambda x: x > 2)(3) #=> True +rectangle_area = lambda a, b: a * b +print rectangle_area(3, 4) #=> 12 # There are built-in higher order functions map(add_10, [1,2,3]) #=> [11, 12, 13] @@ -385,6 +390,9 @@ filter(lambda x: x > 5, [3, 4, 5, 6, 7]) #=> [6, 7] [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] +# You can also use dictionary comprehensions +{i: add_10(i) for i in [1, 2, 3]} #=> {1: 11, 2: 12, 3: 13} + #################################################### ## 5. Classes #################################################### @@ -400,7 +408,8 @@ class Human(object): # Assign the argument to the instance's name attribute self.name = name - # An instance method. All methods take self as the first argument + # An instance method. All methods take self as the first argument, + # which refers to the instance of this class def say(self, msg): return "%s: %s" % (self.name, msg) |