Commit ebd5ea7e authored by Andreas Tille's avatar Andreas Tille
Browse files

No idea why 2to3 has reverted the sequence of imports - restoring the old...

No idea why 2to3 has reverted the sequence of imports - restoring the old sequence does not help unfortunately.
parent 52df64df
Loading
Loading
Loading
Loading
+21 −21
Original line number Diff line number Diff line
@@ -1210,32 +1210,32 @@ Last-Update: Fri, 06 Sep 2019 14:57:13 +0200
 # Home page: http://cycle.sourceforge.net
-#===================================================    
-import os, sys, gettext
-import locale
-
-import wxversion 
-wxversion.ensureMinimal('2.8')
-import wx
-import wx.html
-import wx.lib.colourdb
-
+# ===================================================
+import builtins
+import gettext
+from set_dir import *
+from dialogs import *
+from save_load import *
+from cal_year import *
 from cal_year import *
 from save_load import *
 from dialogs import *
 from set_dir import *
+import wx.lib.colourdb
+import wx.html
+import wx
+import os
+import sys
+import gettext
 import locale
 
-import wxversion 
+import locale
+
+import wxversion
 wxversion.ensureMinimal('2.8')
-import wx
-import wx.html
-import wx.lib.colourdb
 
-from cal_year import *
-from save_load import *
-from dialogs import *
-from set_dir import *
+wxversion.ensureMinimal('2.8')
+
 #from prn import *
 
-import gettext
@@ -1566,13 +1566,13 @@ Last-Update: Fri, 06 Sep 2019 14:57:13 +0200
 # Home page: http://cycle.sourceforge.net
-#===================================================    
+# ===================================================
+import os
+import wx
+import wx.html
+import pickle
+from cal_year import cycle, Val
+from set_dir import *
+from save_load import Load_Cycle, get_f_name, set_color_default
+import pickle
+import wx.html
+import wx
+import os
+from set_dir import *
 import warnings
 # deprecated since release 2.3
 warnings.filterwarnings("ignore",