From 690a0c3c54e9503576e59cc11f6a2cc15b09b782 Mon Sep 17 00:00:00 2001
From: Sorin Noroc <61633959+Sory-Noroc@users.noreply.github.com>
Date: Sat, 13 Mar 2021 09:49:43 +0200
Subject: [PATCH] Fixed tkinter and local imports

---
 organise_desktop/Clean.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/organise_desktop/Clean.py b/organise_desktop/Clean.py
index f5dcdee..31ac9b2 100644
--- a/organise_desktop/Clean.py
+++ b/organise_desktop/Clean.py
@@ -4,19 +4,25 @@
 from .cronController import  schedule_end, schedule_start
 from .organiseDesktop import undo, organise_desktop
 
-if sys.version_info >= (3,):
+try:  # This will throw an error in python 2.x
     from tkinter import *
     from tkinter import messagebox as tkMessageBox
-else:
-    from tkinter import *
+except ImportError:
+    from Tkinter import *
     import tkMessageBox
 
 pwd = os.path.dirname(os.path.abspath(__file__))
 Extensions = json.load(open(pwd+'/Extension.json', 'r'))
-folders = [x for x in Extensions]
 
 class App(Frame):
     """define the GUI"""
+
+    def __init__(self, master=None):
+        Frame.__init__(self, master)
+        self.pack()
+        self.create()
+        self.folders = [x for x in Extensions]
+
     def clean(self):
         checked_extensions = {}
         for x in folders:
@@ -65,11 +71,6 @@ def create(self):
         for key in buttons:
             self.make_button(key, buttons[key])
 
-    def __init__(self, master=None):
-        Frame.__init__(self, master)
-        self.pack()
-        self.create()
-
 def main():
     root = Tk()
     # root.resizable = False            # commenting this approach and applying the below one.
@@ -89,4 +90,4 @@ def main():
     root.destroy()
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()