diff --git a/mavgenerate.py b/mavgenerate.py index b948356f12..bd3b1cac60 100755 --- a/mavgenerate.py +++ b/mavgenerate.py @@ -21,14 +21,15 @@ """ import os -import re +import re +import sys # Python 2.x and 3.x compatibility -try: +if sys.version_info[0] == 3: from tkinter import * import tkinter.filedialog import tkinter.messagebox -except ImportError as ex: +else: # Must be using Python 2.x, import and rename from Tkinter import * import tkFileDialog @@ -38,6 +39,7 @@ del tkFileDialog tkinter.messagebox = tkMessageBox del tkMessageBox + from pymavlink.generator import mavgen from pymavlink.generator import mavparse