[med-svn] [Git][med-team/cycle][master] No idea why 2to3 has reverted the sequence of imports - restoring the old...

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / cycle


Commits:
ebd5ea7e by Andreas Tille at 2019-09-12T07:10:54Z
No idea why 2to3 has reverted the sequence of imports - restoring the old sequence does not help unfortunately.

- - - - -


1 changed file:

- debian/patches/2to3.patch


Changes:

=====================================
debian/patches/2to3.patch
=====================================
@@ -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",



View it on GitLab: https://salsa.debian.org/med-team/cycle/commit/ebd5ea7e45b549a2afa538270030e4f30a422213

-- 
View it on GitLab: https://salsa.debian.org/med-team/cycle/commit/ebd5ea7e45b549a2afa538270030e4f30a422213
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190912/53f6175f/attachment-0001.html>