Minor fixes to slides.

2 files changed, 21 insertions, 13 deletions

diff --git a/basic_python/basics.tex b/basic_python/basics.tex
index 3016747..9cca510 100644
--- a/basic_python/basics.tex
+++ b/basic_python/basics.tex
@@ -546,13 +546,13 @@ In []: a = input()
 5
 
 In []: a
-Out[]: '5'
+Out[]: '5'  # Python 3.x!
 
 In []: a = input('Enter a value: ')
 Enter a value: 5
       \end{lstlisting}
     \item Prompt string is optional.
-    \item All keystrokes are strings!
+    \item \typ{input} produces strings (Python 3.x)
     \item \typ{int()} converts string to int.
   \end{itemize}
 \end{frame}
@@ -580,7 +580,8 @@ In []: from __future__ import print_function
   \begin{itemize}
   \item Put the following code snippet in a file \typ{hello1.py}
   \end{itemize}
-  \begin{lstlisting}
+\begin{lstlisting}
+from __future__ import print_function
 print("Hello", "World")
 print("Goodbye", "World")
 \end{lstlisting}
@@ -596,6 +597,7 @@ Goodbye World
   \frametitle{Simple IO: Console output \ldots}
 Put the following code snippet in a file \typ{hello2.py}
   \begin{lstlisting}
+from __future__ import print_function
 print("Hello", end=' ')
 print("World")
 \end{lstlisting}
@@ -618,9 +620,10 @@ Hello World
 \begin{frame}[fragile]
   \frametitle{What did we learn?}
   \begin{itemize}
-    \item Data types: int, float, complex, boolean, string
-    \item Operators: +, -, *, /, \%, **, +=, -=, *=, /=, >, <, <=, >=, ==, !=, a < b < c
-    \item Simple IO: \kwrd{input} and \kwrd{print}
+  \item Data types: int, float, complex, boolean, string
+  \item Use \typ{type} builtin function to find the type
+  \item Operators: +, -, *, /, \%, **, +=, -=, *=, /=, >, <, <=, >=, ==, !=, a < b < c
+  \item Simple IO: \kwrd{input} and \kwrd{print}
   \end{itemize}
 \end{frame}
 
diff --git a/basic_python/control_flow.tex b/basic_python/control_flow.tex
index a299563..373b1a6 100644
--- a/basic_python/control_flow.tex
+++ b/basic_python/control_flow.tex
@@ -82,14 +82,19 @@ else:
   \item \texttt{if-else} construct or the ternary operator
   \end{itemize}
   \begin{lstlisting}
-   In []: if score_str != 'AA':
-   .....:     score = int(score_str)
-   .....: else:
-   .....:     score = 0
+In []: if score_str != 'AA':
+.....:     score = int(score_str)
+.....: else:
+.....:     score = 0
   \end{lstlisting}
+\end{frame}
+\begin{frame}[fragile]
+  \frametitle{Ternary operator}
+  With the ternary operator you can do this:
+  \small
   \begin{lstlisting}
-   In []: ss = score_str
-   In []: score = int(ss) if ss != 'AA' else 0
+In []: ss = score_str
+In []: score = int(ss) if ss != 'AA' else 0
   \end{lstlisting}
 \end{frame}
 
@@ -136,8 +141,8 @@ else:
   \pause
 \item Shift \typ{a, b} to next values
   \begin{itemize}
-  \item \typ{b = next}
   \item \typ{a = b}
+  \item \typ{b = next}
   \end{itemize}
   \pause
 \item Repeat steps 2, 3 when \typ{b < 30}