cleaned up code examples

rasql · Dec 27, 2019 · 6a9f3c1 · 6a9f3c1
1 parent 348f2c5
commit 6a9f3c1
Show file tree

Hide file tree

Showing 89 changed files with 288 additions and 284 deletions.
diff --git a/docs/app/app.rst b/docs/app/app.rst
@@ -18,21 +18,24 @@ First, we just do the layout for the buttons::
     Button('%').grid(row=1, column=2)
     Button(':').grid(row=1, column=3)
 
-.. autoclass:: calc1.Demo
-
 .. image:: calc1.png
 
+.. literalinclude:: calc1.py
+
+:download:`calc1.py<calc1.py>`
+
 Then we are going to add callback functions to the keys::
 
         Button('7', 'App.lb["text"]  = float(App.lb["text"])*10 + 7').grid(row=2, column=0)
         Button('8', 'App.lb["text"]  = float(App.lb["text"])*10 + 8').grid(row=2, column=1)
         Button('9', 'App.lb["text"]  = float(App.lb["text"])*10 + 9').grid(row=2, column=2)
         Button('x').grid(row=2, column=3)
 
-.. autoclass:: calc2.Demo
-
 .. image:: calc2.png
 
+.. literalinclude:: calc2.py
+
+:download:`calc2.py<calc2.py>`
 
 It turns out that it is simpler to place the calculator logic into 
 a separate function, based on a single character::
@@ -65,13 +68,17 @@ a separate function, based on a single character::
 
             self.lb['text'] = self.val
 
-.. autoclass:: calc3.Demo
-
 .. image:: calc3.png
 
+.. literalinclude:: calc3.py
+
+:download:`calc3.py<calc3.py>`
+
 And finally we put everything together.  
 New Calculator instances can be created via a button press or via a menu.
 
-.. autoclass:: calc4.Calculator
+.. image:: calc4.png
+
+.. literalinclude:: calc4.py
 
-.. image:: calc4.png
+:download:`calc4.py<calc4.py>`
diff --git a/docs/app/calc1.py b/docs/app/calc1.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
 
         App.lb = Label('0.0')
         App.lb.grid(columnspan=4)

diff --git a/docs/app/calc2.py b/docs/app/calc2.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
 
         s = ttk.Style()
         s.configure('TButton', font='Arial 18', padding=5)

diff --git a/docs/app/calc3.py b/docs/app/calc3.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
 
         s = ttk.Style()
         s.configure('TButton', font='Arial 18', padding=5)

diff --git a/docs/app/calc4.py b/docs/app/calc4.py
@@ -59,7 +59,7 @@ def calculate(self, c):
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
         Button('New calculator', Calculator)
         Menu('App')
         Item('Calculator', Calculator)

diff --git a/docs/basic/button1.py b/docs/basic/button1.py
@@ -4,7 +4,7 @@
 class Demo(App):
     """Create different buttons."""
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         App.root.title('Button Demo')
 
         Button()

diff --git a/docs/basic/button2.py b/docs/basic/button2.py
@@ -6,7 +6,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         App.root.title('Calculator')
 
         frame = ttk.Frame(App.root)

diff --git a/docs/basic/button3.py b/docs/basic/button3.py
@@ -6,7 +6,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Adding Buttons', font='Arial 24')
 
         Button('Add Button', 'Button(cmd="print(self)")')

diff --git a/docs/basic/font1.py b/docs/basic/font1.py
@@ -4,7 +4,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         App.root.title('Windows')
 
         Label('Standard fonts', font='Arial 24')

diff --git a/docs/basic/frame1.py b/docs/basic/frame1.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Embedded frames', font='Arial 24')
 
         types = ['flat', 'raised', 'sunken', 'solid', 'ridge', 'groove']

diff --git a/docs/basic/frame2.py b/docs/basic/frame2.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         Label('Embedded frames', font='Arial 24')
 

diff --git a/docs/basic/label1.py b/docs/basic/label1.py
@@ -8,7 +8,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Show images', font='Arial 24')
 
         lb = Label()

diff --git a/docs/basic/label2.py b/docs/basic/label2.py
@@ -5,7 +5,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Show images as labels', font='Arial 24')
 
         dir = os.listdir('icons')

diff --git a/docs/basic/label3.py b/docs/basic/label3.py
@@ -5,7 +5,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Show images as buttons', font='Arial 24')
 
         dir = os.listdir('icons')

diff --git a/docs/basic/label4.py b/docs/basic/label4.py
@@ -5,7 +5,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Show images in a treeview', font='Arial 24')
 
         dir = os.listdir('icons')

diff --git a/docs/basic/scale1.py b/docs/basic/scale1.py
@@ -4,7 +4,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Scale widget', font='Arial 24')
 
         Scale()

diff --git a/docs/basic/style1.py b/docs/basic/style1.py
@@ -5,7 +5,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Select a theme', font='Arial 24')
 
         s = ttk.Style()

diff --git a/docs/basic/style2.py b/docs/basic/style2.py
@@ -6,7 +6,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         Label('Style TButton', font='Arial 24')
         Label('configure TButton')
 

diff --git a/docs/basic/style3.py b/docs/basic/style3.py
@@ -6,7 +6,7 @@
 
 class Demo(App):
     def __init__(self):
-        super(Demo, self).__init__()
+        super().__init__()
         Label('Widget style', font='Arial 24')
 
         Label('widget state')

diff --git a/docs/basic/template.py b/docs/basic/template.py
@@ -6,7 +6,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         App.root.title = 'Tk application template'
         Label('Demo application', font='Arial 24')
 

diff --git a/docs/canvas/canvas2.py b/docs/canvas/canvas2.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self):
-        super(Demo, self).__init__()
+        super().__init__()
         Label("Canvas", font="Arial 24")
 
         c = Canvas(width=600, height=300, background='lightblue')

diff --git a/docs/canvas/canvas8.py b/docs/canvas/canvas8.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
         Label("Drawing lines", font="Arial 24")
 
         Spinbox('width', 'App.c["width"]=self.val.get()', inc=50, to=1000)

diff --git a/docs/concept/concept4.py b/docs/concept/concept4.py
@@ -3,7 +3,7 @@
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
 
         for i in range(3):
             Button()

diff --git a/docs/concept/demo1.py b/docs/concept/demo1.py
@@ -5,7 +5,7 @@
 
 class Demo(App):
     def __init__(self, **kwargs):
-        super(Demo, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         App.root.title = 'Feet to meters'
         Label('feet')
         Label('is equivalent to')

diff --git a/docs/concept/entry1.py b/docs/concept/entry1.py
@@ -4,7 +4,7 @@
 
 class Demo(App):
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
 
         App.l = Label("Get widget value", font="Arial 18")
 

diff --git a/docs/concept/entry2.py b/docs/concept/entry2.py
@@ -3,7 +3,7 @@
 class Demo(App):
     """Convert between feet and meters"""
     def __init__(self): 
-        super(Demo, self).__init__()
+        super().__init__()
 
         Label('Convert between feet and meters', font="Arial 18")
         Label('Enter value and hit ENTER')

diff --git a/docs/event/event.rst b/docs/event/event.rst
@@ -20,7 +20,7 @@ Here is an exemple which prints mouse **Button** and **Motion** events to the st
 
     class Demo(App):
         def __init__(self):
-            super(Demo, self).__init__()
+            super().__init__()
             Label("Button and Motion events", font="Arial 24")
             Label('Display the event in the status bar')
 

diff --git a/docs/event/event1.py b/docs/event/event1.py
@@ -3,7 +3,7 @@
 class Demo(App):
     """Write Button and Motion events to statusbar."""
     def __init__(self):
-        super(Demo, self).__init__()
+        super().__init__()
         Label("Button and Motion events", font="Arial 24")
         Label('Display the event in the status bar')
 

diff --git a/docs/intro/intro.rst b/docs/intro/intro.rst
@@ -1,5 +1,5 @@
-Introduction to Tk
-==================
+Introduction
+============
 
 Tk is a **graphical user interface** (GUI) library. It allows to create windows, buttons and all the 
 other graphical elements. 
@@ -74,8 +74,8 @@ This is the result:
 .. literalinclude:: intro2.py
 
 
-Classic and new themed widgets
-------------------------------
+Classic and themed widgets
+--------------------------
 
 The elements of a graphical user interface are called **widgets**. 
 In Tk there are two generations of widgets:
@@ -108,8 +108,8 @@ The new themed widgets have a gray background and the buttons have uniform size.
 
 .. literalinclude:: intro3.py
 
-Defined our own widget class
-----------------------------
+Let's define our own widget class
+---------------------------------
 
 We are now going to define our own Tk widget classes.
 They have the following advantages:
@@ -130,8 +130,8 @@ This is the new ``Button`` class:
    :pyobject: Button
 
 
-Buttons
--------
+Button
+------
 
 Buttons can be clicked and are used to execute a command associated with them.
 The following demo creates 4 buttons.
@@ -148,8 +148,8 @@ The following demo creates 4 buttons.
 .. literalinclude:: intro5.py
 
 
-Radiobuttons
-------------
+Radiobutton
+-----------
 
 Radiobuttons are active elements which can be clicked and execute actions.
 Only one button is active at any one time.
@@ -161,8 +161,8 @@ Only one button is active at any one time.
 .. literalinclude:: intro6.py
 
 
-Checkbuttons
-------------
+Checkbutton
+-----------
 
 Checkbuttons are active elements which can be clicked and execute actions. 
 Multiple checkbuttons can be selected simultaneously.
@@ -174,8 +174,8 @@ Multiple checkbuttons can be selected simultaneously.
 .. literalinclude:: intro7.py
 
 
-Entry fields
-------------
+Entry field
+-----------
 
 Entry **entry** field presents the user with a single line text field 
 where he can enter a string value.

diff --git a/docs/intro/intro2.py b/docs/intro/intro2.py
@@ -11,5 +11,4 @@ def run(self):
         """Run the main loop."""
         self.root.mainloop()
 
-if __name__ == '__main__':
-    App().run()
+App().run()
diff --git a/docs/intro/intro3.py b/docs/intro/intro3.py
@@ -17,5 +17,4 @@ def run(self):
         """Run the main loop."""
         self.root.mainloop()
 
-if __name__ == '__main__':
-    App().run()
+App().run()