Merge branch 'master' into bits-bytes-hexadecimals

Author: Stefan-Stojanovic

git/essentials/remote-repository/tracking-and-staging-files.md renamed to .archived/git/essentials/remote-repository/tracking-and-staging-files.md

@@ -48,6 +48,27 @@ Types of change:
 
 ### Fixed
 
+## January 25th 2022
+
+### Added
+- [TypeScript - tsc Extending Interfaces - Add more info](https://github.com/enkidevs/curriculum/pull/3029)
+
+### Archived
+- [Git - Remote Repository - Tracking and staging files duplicate](https://github.com/enkidevs/curriculum/pull/2970)
+
+## January 24th 2022
+
+### Changed
+- [Go - For Loops - Make the question fill in the gap only](https://github.com/enkidevs/curriculum/pull/3030)
+
+### Fixed
+- [HTML - List Orders - Remove extra answer field from RQ](https://github.com/enkidevs/curriculum/pull/3031)
+
+## January 10th 2022
+
+### Fixed
+- [Python - Set Comprehension - More corrent answer to appropriate place in RQ](https://github.com/enkidevs/curriculum/pull/2987) 
+
 ## January 9th 2022
 
 ### Changed
@@ -56,13 +77,48 @@ Types of change:
 ## January 5th 2022
 
 ### Fixed
+- [HTML - Image Base - Add mising example using OpenGraph meta tag](https://github.com/enkidevs/curriculum/pull/2984)
 - [Git - Move The Last Commit To A New Branch - Add missing answer fields and improve wording of PQ](https://github.com/enkidevs/curriculum/pull/2983)
 - [Java - Multithreading Use Local Variables - Fix example](https://github.com/enkidevs/curriculum/pull/2982)
 
 ### Changed
 - [Html - Link Relative Paths - Change part of PQ as it wasn't worder properly](https://github.com/enkidevs/curriculum/pull/2985)
 - [Python - Format Text Paragraphs With Textwrap - Make the fill method more clear](https://github.com/enkidevs/curriculum/pull/2981)
 - [Python - Bits Bytes Hexadecimals - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2991)
+- [Python - Python Recipes - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3009)
+- [Python - Is Your Python Healthy - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2999)
+- [Python - Memory Allocation - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces, grammar improvements](https://github.com/enkidevs/curriculum/pull/3002)
+- [Python - Playing With Time - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3007)
+- [Python - Deep Into Collections - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2997)
+- [Python - Python Functions - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3008)
+- [Python - Control Flow II - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2996)
+- [Python - Control Flow I - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2995)
+- [Python - Intro To Modules - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2998)
+- [Python - Classes II - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2993)
+- [Python - More On Dictionaries - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3004)
+- [Python - Math Recipies - Minor grammar improvement](https://github.com/enkidevs/curriculum/pull/3001)
+- [Python - More On Lists - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3005)
+- [Python - Classes I - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/2992)
+- [Python - Looping - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3000)
+- [Python - Meet Python - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3003)
+- [Python - Python Tips - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3010)
+- [Python - Sequential Data Types II - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3012)
+- [Python - Decorators - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3023)
+- [Python - Functional Programming II - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3025)
+- [Python - String Recipes - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3013)
+- [Python - Syntax And Numerical Operators - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3014)
+- [Python - Testing - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3015)
+- [Python - Unordered Data Types - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3016)
+- [Python - Utilities I - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3017)
+- [Python - Utilities II - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3018)
+- [Python - Working With Strings - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3019)
+- [Python - Arrays I - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3020)
+- [Python - Arrays II - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3021)
+- [Python - Comprehension - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3022)
+- [Python - Functional Programming - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3024)
+- [Python - Generators - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3026)
+- [Python - Python Immutability - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3028)
+- [Python - Iterators - Move single-line commands to a single line, update indentation in codeblocks from 4 to 2 spaces](https://github.com/enkidevs/curriculum/pull/3027)
 
 ## January 4th 2022
 

CHANGELOG.md

@@ -3,7 +3,6 @@ description: Learn the in's and out's of git's remote repository.
 insights:
   - introduction-to-remote-repositories
   - working-with-remotes
-  - tracking-and-staging-files
   - merging
   - pushing
 game: git-erminology

git/essentials/remote-repository/README.md

@@ -5,7 +5,6 @@ category: how-to
 practiceQuestion:
   formats:
     - fill-in-the-gap
-    - type-in-the-gap
   context: standalone
 revisionQuestion:
   formats:

go/go-introduction/for-and-switch/go-for-loops.md

@@ -31,15 +31,15 @@ The `reversed` built-in allows us to create an iterator for an iterable sequence
 reversed(seq)
 ```
 
-Where `seq` is an iterable sequence such as a tuple, list, string or range. This returns an iterator which accesses the elements in the sequence in the reverse order. For example, we may use `reversed` to reverse the order of characters in a string.
+Where `seq` is an iterable sequence such as a tuple, list, string, or range. This returns an iterator, which accesses the elements in the sequence in the reverse order. For example, we may use `reversed` to reverse the order of characters in a string.
 
 ```python
 ourString = 'enki'
 print(list(reversed(ourString)))
 # Result: ['i', 'k', 'n', 'e']
 ```
 
-Notice how we could create custom classes that implement the `__reversed__()` method and then use `reversed` on them to quickly and efficiently reverse their ordering. In this way we can begin to see how often the `reversed` function might be useful in day-to-day programming tasks.
+Notice how we could create custom classes that implement the `__reversed__()` method and then use `reversed` on them to quickly and efficiently reverse their ordering. In this way, we can begin to see how often the `reversed` function might be useful in day-to-day programming tasks.
 
 
 ---

python/functional-programming/arrays-i/the-reversed-built-in-function.md

@@ -105,8 +105,7 @@ print(ourString[sObject])
 Use `slice` to remove every second number in the list of numbers.
 
 ```python
-nList = ['1', '2', '3', '4', '5',
-         '6', '7', '8']
+nList = ['1', '2', '3', '4', '5', '6', '7', '8']
 
 sObject = ???(???, ???, ???)
 print(nList[sObject])

python/functional-programming/arrays-i/the-slice-built-in-function.md

@@ -105,18 +105,9 @@ We have three lists, `fnames`, `lnames`, `locations`, which are ordered so that
 Fill in the gaps in the code below to achieve this.
 
 ```python
-locations = ['IT',
-             'FR',
-             'FR',
-             'RU']
-fnames = ['italo',
-          'jean',
-          'emily',
-          'katya']
-lnames = ['calvino',
-          'micheal',
-          'rambert',
-          'sokolov']
+locations = ['IT', 'FR', 'FR', 'RU']
+fnames = ['italo', 'jean', 'emily', 'katya']
+lnames = ['calvino', 'micheal', 'rambert', 'sokolov']
 
 result = zip(???, ???)
 result2 = zip(???, ???)

python/functional-programming/arrays-i/the-zip-built-in-function.md

@@ -29,7 +29,7 @@ revisionQuestion:
 
 ## Content
 
-The `map` function is built in to the Python language. Together with the other built-in functions `filter` and `reduce`, `map` allows us to take a functional approach to programming in Python.
+The `map` function is built into the Python language. Together with the other built-in functions `filter` and `reduce`, `map` allows us to take a functional approach to programming in Python.
 
 `map` applies a given function—`function_here` in the case below—iteratively to all items in a given `input_list`[1]. The basic syntax looks like this:
 
@@ -68,8 +68,7 @@ Finally, it's good to know that we can pass more than one iterable `input_list`
 Let's say we have a list, called `promises`. We want to `make_good` on all our promises, where `make_good` is a previously-defined function that takes a string. Fill in the blanks in the code below to apply `make_good` to all elements in `promises`.  
 
 ```python
-promises = ['learn css', 'learn js',
-  'buy milk', 'be excellent to each other']
+promises = ['learn css', 'learn js', 'buy milk', 'be excellent to each other']
 promises = ???(???, ???)
 ```
 

python/functional-programming/arrays-ii/the-map-built-in-function.md

@@ -105,8 +105,7 @@ print(sorted([4, 0, 2, 3, 1, 5]))
 What is the result of the execution of the following code snippet?
 
 ```python
-print(sorted([0, 2, 3, 1,
-'a', 'b', 'A', 'B']))
+print(sorted([0, 2, 3, 1, 'a', 'b', 'A', 'B']))
 ```
 
 ???

python/functional-programming/arrays-ii/the-sorted-built-in-function.md

@@ -34,11 +34,11 @@ cube_dict = {x: x ** 3 for x in num_list}
 
 ```
 
-Now if we print cube_dict, we get:
+Now, if we print `cube_dict`, we get:
 
 ```python
 for k, v in cube_dict.items():
-    print(k, v)
+  print(k, v)
 # output
 # 1 1
 # 2 8
@@ -58,17 +58,18 @@ print(lcase_freqs)
 # partial output ...
 
 {'u': 0, 'q': 0, 'w': 0, 'o': 0, \
-'b': 0,  'c': 0, 't': 0, 'h': 0, \
+ 'b': 0,  'c': 0, 't': 0, 'h': 0, \
 ...
-'g': 0, 'a': 0, 'n': 0}
+ 'g': 0, 'a': 0, 'n': 0}
+ 
 # Check it is correct:
 lfk = list(lcase_freqs.keys())
 lfk.sort()
 print(lfk)
 ['a', 'b', 'c', 'd', 'e', 'f', \
-'g', 'h', 'i', 'j', 'k', 'l', \
-'m', 'n', 'o', 'p','q', 'r', \
-'s', 't', 'u', 'v', 'w', 'x', \
-'y', 'z']
+ 'g', 'h', 'i', 'j', 'k', 'l', \
+ 'm', 'n', 'o', 'p','q', 'r', \
+ 's', 't', 'u', 'v', 'w', 'x', \
+ 'y', 'z']
 
 ```

python/functional-programming/comprehension/dictionary-comprehension.md

@@ -97,8 +97,7 @@ Use list comprehension to add one and divide by two [(x + 1) / 2] for all elemen
 
 ```python
 l = [1,2,3,4,5]
-x = [((x+1)/2) ??? x % 2 \
-    ??? x ??? x in ???]
+x = [((x+1)/2) ??? x % 2 ??? x ??? x in ???]
 ```
 
 - if

python/functional-programming/comprehension/list-comprehension.md

@@ -27,27 +27,23 @@ Since a list comprehension can take any **expression** as its initial expression
 These are often useful, but are often used to work with matrices.
 
 ```python
-matrix = [[1, 2, 3], [4, 5, 6], \
-[7, 8, 9]]
-
+matrix = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
 ```
 
 Say we want to create another matrix with values equal to the squares of each element in the original matrix:
 
 ```python
-matrix2 = [[x**2 for x in row] for \
-row in matrix]
-#matrix2 = [[1, 4, 9], [16, 25, 36],\
-# [49, 64, 81]]
+matrix2 = [[x**2 for x in row] for row in matrix]
+#matrix2 = [[1, 4, 9], [16, 25, 36], [49, 64, 81]]
 ```
 
 A more advanced list comprehension with two for clauses and two if clauses:
 
 ```python
 lc = [ (x, y) for x in \
-range(10) if x % 2 == 0 \
-for y in range(20) if \
-y % 3 == 0 ]
+     range(10) if x % 2 == 0 \
+     for y in range(20) if \
+     y % 3 == 0 ]
 # lc
 # [(0, 0), (0, 3), (0, 6), \
 # (0, 9), (0, 12), (0, 15), (0, 18),\
@@ -70,7 +66,6 @@ Use nested list comprehension to generate a list of tuples, where the first elem
 Ex: (1,1),(1,2),(1,3),...(9,7),(9,8),(9,9).
 
 ```python
-
 l = [??? for x in range(10)\
     if ??? for y in ???]
 ```

python/functional-programming/comprehension/nested-lists-comprehension.md

@@ -33,22 +33,19 @@ Imagine we have the following list:
 
 ```python
 my_list = [1, 2, 3, 4, 5, 6, 7, 8]
-
 ```
 
 And we need a set containing only even numbers in the list. This can be easily achieved with **set comprehension**:
 
 ```python
 even_set = {x for x in my_list if x%2 == 0}
-
 ```
 
 We can now check the result:
 
 ```python
 print(even_set)
 # {8, 2, 4, 6}
-
 ```
 
 Note that the above operation would work even if my_list contained some duplicate values, e.g:
@@ -67,10 +64,8 @@ since sets by definition do not allow duplicates.
 Fill in the following code snippet. It creates a new set that contains elements of list `l` that are even and adds one and divides by two the odd numbers:
 
 ```python
-
 l = [10, 11, 13, 14, 18, 19]
-new_set = {x ??? x % 2 == 0 else/
-          ??? for x ??? l}
+new_set = {x ??? x % 2 == 0 else ??? for x ??? l}
 ```
 
 - if
@@ -88,15 +83,14 @@ new_set = {x ??? x % 2 == 0 else/
 What will the `odd_set` look like after we run the following code snippet?
 
 ```python
-
 l = [1,3,3,2,4,5,5,8,9]
 odd_set = {x for x in l if x % 2}
 ```
 
 ???
 
-- {1,3,3,5,5,9}
 - {1,3,5,9}
+- {1,3,3,5,5,9}
 - {1,2,3,4,5,8,9}
 - {2,4,8}
 

python/functional-programming/comprehension/set-comprehension.md

@@ -35,7 +35,7 @@ If you need to lowercase all the input strings:
 ```python
 lower_list = []
 for word in input_list:
-    lower_list.append(word.lower())
+  lower_list.append(word.lower())
 ```
 
 Instead, you can use `map()` to push the loop into compiled C code:
@@ -47,8 +47,7 @@ lower_list = map(str.lower, input_list)
 Also, in Python 2.0 or above, there are list comprehensions. List comprehension are the "pythonic" way to approach this situation. `map()` is more often used in JavaScript. We recommend usage of list comprehension:
 
 ```python
-lower_list = [word.lower() \
-  for word in input_list]
+lower_list = [word.lower() for word in input_list]
 ```
 
 They are both more efficient than simple `for` loop statement.
@@ -63,8 +62,7 @@ Use list comprehension to modify a list of characters such that all its elements
 ```python
 strings = ['a', 'e', 'i', 'o', 'u']
 
-lower_list = [word.??? \
-  for word in ???]
+lower_list = [word.??? for word in ???]
 ```
 
 - upper()

python/functional-programming/comprehension/speed-up-your-for-loop-using-map-or-list-comprehensions.md

@@ -32,8 +32,7 @@ def get_fahrenheit(method):
   # methods, pass self as a parameter
   def wrapper(self):
     # "self" argument is passed
-    return "{0} F"
-      .format(method(self) * 1.8 + 32)
+    return "{0} F".format(method(self) * 1.8 + 32)
   return wrapper
 
 class Temperature(object):
@@ -55,8 +54,7 @@ We got it now working for methods. But what if we are looking to decorate method
 def get_fahrenheit(method):
   # exepect any number of args/named args
   def wrapper(*args, **kwargs):
-    return "{0} F"
-     .format(method(*args,**kwargs)*1.8+32)
+    return "{0} F".format(method(*args,**kwargs)*1.8+32)
   return wrapper
 
 class Temperature(object):
@@ -65,10 +63,8 @@ class Temperature(object):
 
   @get_fahrenheit
   #two extra arguments expected here
-  def get_temp(self, extra1, extra2 = 0,
-   extra3 = 0):
-    return self.degrees + extra1 + extra2
-     + extra3
+  def get_temp(self, extra1, extra2 = 0, extra3 = 0):
+    return self.degrees + extra1 + extra2 + extra3
 temp = Temperature(15)
 # self is passed by default
 print(temp.get_temp(3, extra2 = 1))