Merge branch 'tkinter-imports'

10 files changed, 21 insertions, 21 deletions

diff --git a/jfr_playoff/gui/__init__.py b/jfr_playoff/gui/__init__.py
index 70b8ac8..af53c25 100644
--- a/jfr_playoff/gui/__init__.py
+++ b/jfr_playoff/gui/__init__.py
@@ -4,8 +4,8 @@ import codecs, copy, json, os, shutil, sys, tempfile, threading, traceback, webb
 from collections import OrderedDict
 import logging as log
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 import tkFileDialog as tkfd
 import tkMessageBox as tkmb
 
diff --git a/jfr_playoff/gui/frames/__init__.py b/jfr_playoff/gui/frames/__init__.py
index 8b22f52..7a346e1 100644
--- a/jfr_playoff/gui/frames/__init__.py
+++ b/jfr_playoff/gui/frames/__init__.py
@@ -3,8 +3,8 @@
 from functools import partial
 import types
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 import tkMessageBox
 
 from ..variables import BoolVar
diff --git a/jfr_playoff/gui/frames/match.py b/jfr_playoff/gui/frames/match.py
index ad630d0..5437887 100644
--- a/jfr_playoff/gui/frames/match.py
+++ b/jfr_playoff/gui/frames/match.py
@@ -2,9 +2,9 @@
 
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter.font import Font
-from tkinter import ttk
+import Tkinter as tk
+from tkFont import Font
+import ttk
 
 from ..frames import GuiFrame, RepeatableFrame, ScrollableFrame
 from ..frames import WidgetRepeater, RepeatableEntry, NumericSpinbox
diff --git a/jfr_playoff/gui/frames/network.py b/jfr_playoff/gui/frames/network.py
index 96c5daa..927c4b1 100644
--- a/jfr_playoff/gui/frames/network.py
+++ b/jfr_playoff/gui/frames/network.py
@@ -3,8 +3,8 @@
 import socket
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 import tkMessageBox as tkmb
 
 from ...db import PlayoffDB
diff --git a/jfr_playoff/gui/frames/team.py b/jfr_playoff/gui/frames/team.py
index 8e17422..b174e27 100644
--- a/jfr_playoff/gui/frames/team.py
+++ b/jfr_playoff/gui/frames/team.py
@@ -2,9 +2,9 @@
 
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter.font import Font
-from tkinter import ttk
+import Tkinter as tk
+from tkFont import Font
+import ttk
 
 from ..frames import GuiFrame, RepeatableFrame, ScrollableFrame
 from ..frames import WidgetRepeater, RepeatableEntry, NumericSpinbox
diff --git a/jfr_playoff/gui/frames/translations.py b/jfr_playoff/gui/frames/translations.py
index a369159..2045f64 100644
--- a/jfr_playoff/gui/frames/translations.py
+++ b/jfr_playoff/gui/frames/translations.py
@@ -3,8 +3,8 @@
 import copy
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 
 from ..frames import RepeatableFrame, WidgetRepeater, ScrollableFrame
 from ...i18n import PLAYOFF_I18N_DEFAULTS
diff --git a/jfr_playoff/gui/frames/visual.py b/jfr_playoff/gui/frames/visual.py
index 1cbe177..9794ef3 100644
--- a/jfr_playoff/gui/frames/visual.py
+++ b/jfr_playoff/gui/frames/visual.py
@@ -2,8 +2,8 @@
 
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 import tkColorChooser as tkcc
 
 from ..frames import GuiFrame, RepeatableFrame, ScrollableFrame
diff --git a/jfr_playoff/gui/logframe.py b/jfr_playoff/gui/logframe.py
index 078226e..90b7f00 100644
--- a/jfr_playoff/gui/logframe.py
+++ b/jfr_playoff/gui/logframe.py
@@ -4,8 +4,8 @@ import datetime
 import logging as log
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 import tkFileDialog as tkfd
 
 class LogWindow(tk.Toplevel):
diff --git a/jfr_playoff/gui/tabs.py b/jfr_playoff/gui/tabs.py
index cc8a291..810ee13 100644
--- a/jfr_playoff/gui/tabs.py
+++ b/jfr_playoff/gui/tabs.py
@@ -3,8 +3,8 @@
 import os
 from collections import OrderedDict
 
-import tkinter as tk
-from tkinter import ttk
+import Tkinter as tk
+import ttk
 import tkFileDialog as tkfd
 import tkMessageBox as tkmb
 
diff --git a/jfr_playoff/gui/variables.py b/jfr_playoff/gui/variables.py
index ac9e0a6..80949aa 100644
--- a/jfr_playoff/gui/variables.py
+++ b/jfr_playoff/gui/variables.py
@@ -1,6 +1,6 @@
 #coding=utf-8
 
-import tkinter as tk
+import Tkinter as tk
 
 class NotifyVar(tk.Variable):
     def __init__(self, *args, **kwargs):