beremiz: comparison BeremizIDE.py

equal deleted inserted replaced

-:fda6c1a37662
+:f62625418bff
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-from __future__ import absolute_import
-from __future__ import print_function
 import os
 import sys
 import shutil
 import time
 import signal
 IDEFrame._init_utils(self)
 def _init_coll_FileMenu_Items(self, parent):
 AppendMenu(parent, help='', id=wx.ID_NEW,
-kind=wx.ITEM_NORMAL, text=_(u'New') + '\tCTRL+N')
+kind=wx.ITEM_NORMAL, text=_('New') + '\tCTRL+N')
 AppendMenu(parent, help='', id=wx.ID_OPEN,
-kind=wx.ITEM_NORMAL, text=_(u'Open') + '\tCTRL+O')
+kind=wx.ITEM_NORMAL, text=_('Open') + '\tCTRL+O')
 parent.Append(ID_FILEMENURECENTPROJECTS, _("&Recent Projects"), self.RecentProjectsMenu)
 parent.AppendSeparator()
 parent.Append(wx.ID_ANY, _("&Tutorials and Examples"), self.TutorialsProjectsMenu)
 exemples_dir = Bpath("exemples")
 project_list = sorted(os.listdir(exemples_dir))
 for idx, dirname  in enumerate(project_list):
-text = u'&%d: %s' % (idx + 1, dirname)
+text = '&%d: %s' % (idx + 1, dirname)
 item = self.TutorialsProjectsMenu.Append(wx.ID_ANY, text, '')
 projectpath = os.path.join(exemples_dir, dirname)
 self.ResetView()
 self.Bind(wx.EVT_MENU, OpenExemple, item)
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_SAVE,
-kind=wx.ITEM_NORMAL, text=_(u'Save') + '\tCTRL+S')
+kind=wx.ITEM_NORMAL, text=_('Save') + '\tCTRL+S')
 AppendMenu(parent, help='', id=wx.ID_SAVEAS,
-kind=wx.ITEM_NORMAL, text=_(u'Save as') + '\tCTRL+SHIFT+S')
+kind=wx.ITEM_NORMAL, text=_('Save as') + '\tCTRL+SHIFT+S')
 AppendMenu(parent, help='', id=wx.ID_CLOSE,
-kind=wx.ITEM_NORMAL, text=_(u'Close Tab') + '\tCTRL+W')
+kind=wx.ITEM_NORMAL, text=_('Close Tab') + '\tCTRL+W')
 AppendMenu(parent, help='', id=wx.ID_CLOSE_ALL,
-kind=wx.ITEM_NORMAL, text=_(u'Close Project') + '\tCTRL+SHIFT+W')
+kind=wx.ITEM_NORMAL, text=_('Close Project') + '\tCTRL+SHIFT+W')
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_PAGE_SETUP,
-kind=wx.ITEM_NORMAL, text=_(u'Page Setup') + '\tCTRL+ALT+P')
+kind=wx.ITEM_NORMAL, text=_('Page Setup') + '\tCTRL+ALT+P')
 AppendMenu(parent, help='', id=wx.ID_PREVIEW,
-kind=wx.ITEM_NORMAL, text=_(u'Preview') + '\tCTRL+SHIFT+P')
+kind=wx.ITEM_NORMAL, text=_('Preview') + '\tCTRL+SHIFT+P')
 AppendMenu(parent, help='', id=wx.ID_PRINT,
-kind=wx.ITEM_NORMAL, text=_(u'Print') + '\tCTRL+P')
+kind=wx.ITEM_NORMAL, text=_('Print') + '\tCTRL+P')
 parent.AppendSeparator()
 AppendMenu(parent, help='', id=wx.ID_EXIT,
-kind=wx.ITEM_NORMAL, text=_(u'Quit') + '\tCTRL+Q')
+kind=wx.ITEM_NORMAL, text=_('Quit') + '\tCTRL+Q')
 self.Bind(wx.EVT_MENU, self.OnNewProjectMenu, id=wx.ID_NEW)
 self.Bind(wx.EVT_MENU, self.OnOpenProjectMenu, id=wx.ID_OPEN)
 self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=wx.ID_SAVE)
 self.Bind(wx.EVT_MENU, self.OnSaveProjectAsMenu, id=wx.ID_SAVEAS)
 self.Bind(wx.EVT_MENU, self.OnPageSetupMenu, id=wx.ID_PAGE_SETUP)
 self.Bind(wx.EVT_MENU, self.OnPreviewMenu, id=wx.ID_PREVIEW)
 self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT)
 self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT)
-self.AddToMenuToolBar([(wx.ID_NEW, "new", _(u'New'), None),
+self.AddToMenuToolBar([(wx.ID_NEW, "new", _('New'), None),
-(wx.ID_OPEN, "open", _(u'Open'), None),
+(wx.ID_OPEN, "open", _('Open'), None),
-(wx.ID_SAVE, "save", _(u'Save'), None),
+(wx.ID_SAVE, "save", _('Save'), None),
-(wx.ID_SAVEAS, "saveas", _(u'Save As...'), None),
+(wx.ID_SAVEAS, "saveas", _('Save As...'), None),
-(wx.ID_PRINT, "print", _(u'Print'), None)])
+(wx.ID_PRINT, "print", _('Print'), None)])
 def _RecursiveAddMenuItems(self, menu, items):
 for name, text, helpstr, children in items:
 if len(children) > 0:
 new_menu = wx.Menu(title='')
 def _init_coll_HelpMenu_Items(self, parent):
 def handler(event):
 return wx.MessageBox(
 version.GetCommunityHelpMsg(),
-_(u'Community support'),
+_('Community support'),
 wx.OK | wx.ICON_INFORMATION)
-item = parent.Append(wx.ID_ANY, _(u'Community support'), '')
+item = parent.Append(wx.ID_ANY, _('Community support'), '')
 self.Bind(wx.EVT_MENU, handler, item)
 parent.Append(wx.MenuItem(helpString='', id=wx.ID_ABOUT,
-kind=wx.ITEM_NORMAL, text=_(u'About')))
+kind=wx.ITEM_NORMAL, text=_('About')))
 self.Bind(wx.EVT_MENU, self.OnAboutMenu, id=wx.ID_ABOUT)
 def _init_coll_ConnectionStatusBar_Fields(self, parent):
 parent.SetFieldsCount(3)
 if answer == wx.ID_YES:
 self.CTR.SaveProject()
 elif answer == wx.ID_CANCEL:
 return False
-for idx in xrange(self.TabsOpened.GetPageCount()):
+for idx in range(self.TabsOpened.GetPageCount()):
 window = self.TabsOpened.GetPage(idx)
 if not window.CheckSaveBeforeClosing():
 return False
 return True
 MenuToolBar.EnableTool(wx.ID_SAVEAS, False)
 self.FileMenu.Enable(wx.ID_CLOSE_ALL, False)
 def RefreshRecentProjectsMenu(self):
 try:
-recent_projects = map(DecodeFileSystemPath,
+recent_projects = list(map(DecodeFileSystemPath,
-self.GetConfigEntry("RecentProjects", []))
+self.GetConfigEntry("RecentProjects", [])))
 except Exception:
 recent_projects = []
 while self.RecentProjectsMenu.GetMenuItemCount() > 0:
 item = self.RecentProjectsMenu.FindItemByPosition(0)
 self.RecentProjectsMenu.Remove(item)
 self.FileMenu.Enable(ID_FILEMENURECENTPROJECTS, len(recent_projects) > 0)
 for idx, projectpath in enumerate(recent_projects):
-text = u'&%d: %s' % (idx + 1, projectpath)
+text = '&%d: %s' % (idx + 1, projectpath)
 item = self.RecentProjectsMenu.Append(wx.ID_ANY, text, '')
 self.Bind(wx.EVT_MENU, self.GenerateOpenRecentProjectFunction(projectpath), item)
 def GenerateOpenRecentProjectFunction(self, projectpath):
 if selected >= 0:
 panel = self.TabsOpened.GetPage(selected)
 else:
 panel = None
 if panel != self.LastPanelSelected:
-for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()):
+for i in range(self.EditMenuSize, self.EditMenu.GetMenuItemCount()):
 item = self.EditMenu.FindItemByPosition(self.EditMenuSize)
 if item is not None:
 if item.IsSeparator():
 self.EditMenu.RemoveItem(item)
 else:
 self.EditMenu.AppendSeparator()
 self.GenerateMenuRecursive(items, self.EditMenu)
 if panel is not None:
 panel.RefreshConfNodeMenu(self.EditMenu)
 else:
-for i in xrange(self.EditMenuSize, self.EditMenu.GetMenuItemCount()):
+for i in range(self.EditMenuSize, self.EditMenu.GetMenuItemCount()):
 item = self.EditMenu.FindItemByPosition(i)
 if item is not None:
 if item.IsSeparator():
 self.EditMenu.RemoveItem(item)
 else:
 def GetConfigEntry(self, entry_name, default):
 return cPickle.loads(str(self.Config.Read(entry_name, cPickle.dumps(default))))
 def ResetConnectionStatusBar(self):
-for field in xrange(self.ConnectionStatusBar.GetFieldsCount()):
+for field in range(self.ConnectionStatusBar.GetFieldsCount()):
 self.ConnectionStatusBar.SetStatusText('', field)
 def ResetView(self):
 IDEFrame.ResetView(self)
 if self.CTR is not None:
 self.DebugVariablePanel.SetDataProducer(None)
 self.ResetConnectionStatusBar()
 def RefreshConfigRecentProjects(self, projectpath, err=False):
 try:
-recent_projects = map(DecodeFileSystemPath,
+recent_projects = list(map(DecodeFileSystemPath,
-self.GetConfigEntry("RecentProjects", []))
+self.GetConfigEntry("RecentProjects", [])))
 except Exception:
 recent_projects = []
 if projectpath in recent_projects:
 recent_projects.remove(projectpath)
 if not err:
 recent_projects.insert(0, projectpath)
 self.Config.Write("RecentProjects", cPickle.dumps(
-map(EncodeFileSystemPath, recent_projects[:MAX_RECENT_PROJECTS])))
+list(map(EncodeFileSystemPath, recent_projects[:MAX_RECENT_PROJECTS]))))
 self.Config.Flush()
 def ResetPerspective(self):
 IDEFrame.ResetPerspective(self)
 self.RefreshStatusToolBar()

branch	python3
changeset 3750	f62625418bff
parent 3712	cea2005bf2c9
child 3752	9f6f46dbe3ae