eric: comparison Preferences/ConfigurationPages/EditorHighlightingStylesPage.py

-:b0996e4a289e
+:1d8dd9706f46
 from PyQt4.QtCore import pyqtSlot, QFileInfo
 from PyQt4.QtGui import QPalette, QFileDialog, QColorDialog, QFontDialog, \
 QInputDialog, QMessageBox
-from ConfigurationPageBase import ConfigurationPageBase
+from .ConfigurationPageBase import ConfigurationPageBase
-from Ui_EditorHighlightingStylesPage import Ui_EditorHighlightingStylesPage
+from .Ui_EditorHighlightingStylesPage import Ui_EditorHighlightingStylesPage
 from E4XML.XMLUtilities import make_parser
 from E4XML.XMLErrorHandler import XMLErrorHandler, XMLFatalParseError
 from E4XML.XMLEntityResolver import XMLEntityResolver
 from E4XML.HighlightingStylesWriter import HighlightingStylesWriter
 self.lexer = None
 self.lexers = lexers
 # set initial values
-languages = [''] + self.lexers.keys()
+languages = sorted([''] + list(self.lexers.keys()))
-languages.sort()
 self.lexerLanguageComboBox.addItems(languages)
 self.on_lexerLanguageComboBox_activated("")
 def save(self):
 """
 Public slot to save the Editor Highlighting Styles configuration.
 """
-for lexer in self.lexers.values():
+for lexer in list(self.lexers.values()):
 lexer.writeSettings(Preferences.Prefs.settings, "Scintilla")
 @pyqtSlot(str)
 def on_lexerLanguageComboBox_activated(self, language):
 """
 if colour.isValid():
 pl = self.sampleText.palette()
 pl.setColor(QPalette.Base, colour)
 self.sampleText.setPalette(pl)
 self.sampleText.repaint()
-for style in self.lexer.ind2style.values():
+for style in list(self.lexer.ind2style.values()):
 self.lexer.setPaper(colour, style)
 @pyqtSlot()
 def on_fontButton_clicked(self):
 """
 Private method used to change the font of all styles of a selected lexer.
 """
 font, ok = QFontDialog.getFont(self.lexer.font(self.style))
 if ok:
 self.sampleText.setFont(font)
-for style in self.lexer.ind2style.values():
+for style in list(self.lexer.ind2style.values()):
 self.lexer.setFont(font, style)
 def on_eolfillCheckBox_toggled(self, b):
 """
 Private method used to set the eolfill for the selected style and lexer.
 [on, off],
 0, False)
 if ok:
 enabled = selection == on
 self.eolfillCheckBox.setChecked(enabled)
-for style in self.lexer.ind2style.values():
+for style in list(self.lexer.ind2style.values()):
 self.lexer.setEolFill(enabled, style)
 @pyqtSlot()
 def on_defaultButton_clicked(self):
 """
 @pyqtSlot()
 def on_allDefaultButton_clicked(self):
 """
 Private method to set all styles to their default values.
 """
-for style in self.lexer.ind2style.values():
+for style in list(self.lexer.ind2style.values()):
 self.__setToDefault(style)
 self.on_styleElementList_currentRowChanged(self.styleElementList.currentRow())
 def __setToDefault(self, style):
 """
 @pyqtSlot()
 def on_exportAllButton_clicked(self):
 """
 Private slot to export the styles of all lexers.
 """
-self.__exportStyles(self.lexers.values())
+self.__exportStyles(list(self.lexers.values()))
 def __exportStyles(self, lexers):
 """
 Private method to export the styles of the given lexers.
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fn += ex
 try:
-f = open(fn, "wb")
+f = open(fn, "w")
 HighlightingStylesWriter(f, lexers).writeXML()
 f.close()
-except IOError, err:
+except IOError as err:
 QMessageBox.critical(self,
 self.trUtf8("Export Highlighting Styles"),
 self.trUtf8("""<p>The highlighting styles could not be exported"""
 """ to file <b>{0}</b>.</p><p>Reason: {1}</p>""")\
-.format(fn, unicode(err))
+.format(fn, str(err))
 )
 def __importStyles(self, lexers):
 """
 Private method to import the styles of the given lexers.
 if not fn:
 return
 try:
-f = open(fn, "rb")
+f = open(fn, "r")
 try:
 line = f.readline()
 dtdLine = f.readline()
 finally:
 f.close()
-except IOError, err:
+except IOError as err:
 QMessageBox.critical(self,
 self.trUtf8("Import Highlighting Styles"),
 self.trUtf8("""<p>The highlighting styles could not be read"""
 """ from file <b>{0}</b>.</p><p>Reason: {1}</p>""")\
-.format(fn, unicode(err))
+.format(fn, str(err))
 )
 return
 validating = dtdLine.startswith("<!DOCTYPE")
 parser = make_parser(validating)
 parser.setContentHandler(handler)
 parser.setEntityResolver(er)
 parser.setErrorHandler(eh)
 try:
-f = open(fn, "rb")
+f = open(fn, "r")
 try:
 try:
 parser.parse(f)
 except UnicodeEncodeError:
 f.seek(0)
 buf = cStringIO.StringIO(f.read())
 parser.parse(buf)
 finally:
 f.close()
-except IOError, err:
+except IOError as err:
 QMessageBox.critical(self,
 self.trUtf8("Import Highlighting Styles"),
 self.trUtf8("""<p>The highlighting styles could not be read"""
 """ from file <b>{0}</b>.</p><p>Reason: {1}</p>""")\
-.format(fn, unicode(err))
+.format(fn, str(err))
 )
 return
 except XMLFatalParseError:
 QMessageBox.critical(self,
 self.trUtf8("Import Highlighting Styles"),

Mercurial Repositories > eric / file comparison

comparison: Preferences/ConfigurationPages/EditorHighlightingStylesPage.py

Preferences/ConfigurationPages/EditorHighlightingStylesPage.py