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

Akuli · Akuli · commit 42f9da78af0f · 2017-01-01T22:00:36.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# generated html files
+html/
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ They will probably support Python 3 by the time you've learned the
 basics and you may actually need them.
 
 I have tested most of the code in this tutorial on Python 3.4, but
-everything should also work on Python 3.2 and all newer Pythons.
+everything should also work on Python 3.3, 3.2 and all newer Pythons.
 
 ## List of contents
 
diff --git a/TODO.md b/TODO.md
@@ -3,14 +3,18 @@
 This tutorial is not complete. It still needs:
 
 - range somewhere
-- Better lists chapter, also introduce tuples in it
 - **More exercises and examples everywhere!**
-- explain bool(x) and why it matters
+- classes part 1:
+
+        <deniska> Akuli: I would probably add an example of refactoring
+                  a bunch of functions working with shared global data
+                  into a class because it's a pretty typical usecase
+
 - classes part 2
     - non-public `_variables` (maybe reading PEP-8 is enough to explain this?)
     - "singular" inheritance, inheritance of built-in classes
     - using super
-- no classes part 3 with multiple inheritance, it's not something people need
+    - advise to avoid multiple inheritance
 - iterables and iterators: something most Python programmers need to be
     aware of
 - last chapter: "What should I do now?" links to other resources
diff --git a/loops.md b/loops.md
@@ -384,7 +384,7 @@ while True:
             print("I didn't know you to begin with.")
 
     elif option == '4':
-        if len(namelist) == 0:  # len is short for length
+        if namelist == []:
             print("I don't know anybody yet.")
         else:
             for name in namelist:
diff --git a/make-html.py b/make-html.py
@@ -0,0 +1,51 @@
+import glob
+import shutil
+import os
+import sys
+import webbrowser
+
+try:
+    import mistune
+except ImportError:
+    print("mistune isn't installed. You can install it like this:\n\n",
+          "   thispython -m pip install mistune", file=sys.stderr)
+    sys.exit(1)
+
+
+def main():
+    if os.path.exists('html'):
+        if input("html exists. Do you want "
+                 "to remove it? [Y/n] ").upper() == 'N':
+            print("Interrupt.")
+            return
+        if os.path.isdir('html'):
+            shutil.rmtree('html')
+        else:
+            os.remove('html')
+    os.mkdir('html')
+    print("Generating HTML files...")
+    for markdownfile in glob.glob('*.md'):
+        htmlfile = os.path.join('html', markdownfile[:-3] + '.html')
+        print(' ', markdownfile, '->', htmlfile)
+        with open(markdownfile, 'r') as f1:
+            with open(htmlfile, 'w') as f2:
+                md = f1.read()
+                md = md.replace('.md)', '.html)')
+                html = mistune.markdown(md)
+                print(html, file=f2)
+    os.rename(os.path.join('html', 'README.html'),
+              os.path.join('html', 'index.html'))
+    shutil.copytree('images', os.path.join('html', 'images'))
+    print()
+    print("*********************")
+    print()
+    print("Ready! The files are in the html directory,")
+    print("double-click html/index.html to read the tutorial.")
+    print()
+    if input("Do you want to view the tutorial now? [Y/n] ").upper() != 'N':
+        print("Opening the tutorial...")
+        webbrowser.open(os.path.join('html', 'index.html'))
+
+
+if __name__ == '__main__':
+    main()
