Skip to content

Commit 7a12759

Browse files
committed
more python3 fixes
1 parent b725dfa commit 7a12759

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

examples/GUI/fitter.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
import sys
1616
if sys.version_info[0] < 3:
1717
import Tkinter as Tk
18+
import tkFont as font
1819
else:
1920
import tkinter as Tk
21+
from tkinter import font
2022

21-
import tkFont
2223

2324
def str_to_f(str):
2425
a = parse_expr(str, evaluate=0)
@@ -31,7 +32,7 @@ def __init__(self, parent):
3132

3233
self.parent = parent
3334

34-
myfont = tkFont.Font() #size=14)
35+
myfont = font.Font() #size=14)
3536

3637
# data file
3738

examples/GUI/fitter_theme.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
import sys
1616
if sys.version_info[0] < 3:
1717
import Tkinter as Tk
18+
import ttk
19+
import tkFont as font
1820
else:
1921
import tkinter as Tk
22+
from tkinter import ttk
23+
from tkinter import font
2024

21-
import ttk
22-
23-
import tkFont
2425

2526
def str_to_f(str):
2627
a = parse_expr(str, evaluate=0)
@@ -36,7 +37,7 @@ def __init__(self, parent):
3637
self.style = ttk.Style()
3738
self.style.theme_use("default")
3839

39-
#myfont = tkFont.Font(size=14)
40+
#myfont = font.Font(size=14)
4041

4142
# data file
4243

examples/GUI/parse.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from sympy.abc import x
44
from sympy.parsing.sympy_parser import parse_expr
55

6-
str = raw_input("f(x) = ")
6+
fstr = input("f(x) = ")
77

8-
a = parse_expr(str, evaluate=0)
8+
a = parse_expr(fstr, evaluate=0)
99

1010
f = sympy.lambdify(x, a, "numpy")
1111

1212
x = np.linspace(0,1,100)
1313

14-
print f(x)
14+
print(f(x))

0 commit comments

Comments
 (0)