sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

[python console] remove 'u' prefixes from strings (fix #18171)

Browse Source
This commit is contained in:
Alexander Bruy 2018-02-23 10:39:08 +02:00
parent a554409ede
commit 7823025b8d
6 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/console/console.py
View File

@ -18,8 +18,6 @@ email : lrssvtml (at) gmail (dot) com
***************************************************************************/
Some portions of code were taken from https://code.google.com/p/pydee/
"""
from builtins import str
from builtins import range
import os
from qgis.PyQt.QtCore import Qt, QTimer, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir

4
python/console/console_compile_apis.py
View File

@ -64,7 +64,7 @@ class PrepareAPIDialog(QDialog):
rslt = self.tr("Error")
if prepd:
rslt = QCoreApplication.translate("PythonConsole", "Saved")
self.ui.label.setText(u'{0} {1}'.format(self.ui.label.text(), rslt))
self.ui.label.setText('{0} {1}'.format(self.ui.label.text(), rslt))
self._api = None
self.ui.progressBar.setVisible(False)
self.ui.buttonBox.button(QDialogButtonBox.Cancel).setText(
@ -73,7 +73,7 @@ class PrepareAPIDialog(QDialog):
def prepareAPI(self):
# self.ui.textEdit_Qsci.setLexer(0)
exec(u'self.qlexer = {0}(self.ui.textEdit_Qsci)'.format(self._api_lexer))
exec('self.qlexer = {0}(self.ui.textEdit_Qsci)'.format(self._api_lexer))
# self.ui.textEdit_Qsci.setLexer(self.qlexer)
self._api = QsciAPIs(self.qlexer)
self._api.apiPreparationFinished.connect(self._preparationFinished)

8
python/console/console_editor.py
View File

@ -432,7 +432,7 @@ class Editor(QsciScintilla):
getCmd = []
for strLine in listText:
getCmd.append(strLine)
pasteText = u"\n".join(getCmd)
pasteText = "\n".join(getCmd)
url = 'http://codepad.org'
values = {'lang': 'Python',
'code': pasteText,
@ -591,7 +591,7 @@ class Editor(QsciScintilla):
tmpFile = self.createTempFile()
filename = tmpFile
self.parent.pc.shell.runCommand(u"exec(open(u'{0}'.encode('{1}')).read())"
self.parent.pc.shell.runCommand("exec(open('{0}'.encode('{1}')).read())"
.format(filename.replace("\\", "/"), sys.getfilesystemencoding()))
def runSelectedCode(self): # spellok
@ -626,9 +626,9 @@ class Editor(QsciScintilla):
if not filename:
filename = self.parent.tw.currentWidget().path
# source = open(filename, 'r').read() + '\n'
if isinstance(source, type(u"")):
if isinstance(source, type("")):
source = source.encode('utf-8')
if isinstance(filename, type(u"")):
if isinstance(filename, type("")):
filename = filename.encode('utf-8')
if filename:
compile(source, filename, 'exec')

2
python/console/console_output.py
View File

@ -18,8 +18,6 @@ email : lrssvtml (at) gmail (dot) com
***************************************************************************/
Some portions of code were taken from https://code.google.com/p/pydee/
"""
from builtins import range
from builtins import object
from qgis.PyQt.QtCore import Qt, QCoreApplication
from qgis.PyQt.QtGui import QColor, QFont, QKeySequence, QFontDatabase

6
python/console/console_sci.py
View File

@ -18,8 +18,6 @@ email : lrssvtml (at) gmail (dot) com
***************************************************************************/
Some portions of code were taken from https://code.google.com/p/pydee/
"""
from builtins import bytes
from builtins import range
from qgis.PyQt.QtCore import Qt, QByteArray, QCoreApplication, QFile, QSize
from qgis.PyQt.QtWidgets import QDialog, QMenu, QShortcut, QApplication
@ -600,7 +598,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter):
more = False
else:
self.buffer.append(cmd)
src = u"\n".join(self.buffer)
src = "\n".join(self.buffer)
more = self.runsource(src)
if not more:
self.buffer = []
@ -627,7 +625,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter):
hook = sys.excepthook
try:
def excepthook(etype, value, tb):
self.write(u"".join(traceback.format_exception(etype, value, tb)))
self.write("".join(traceback.format_exception(etype, value, tb)))
sys.excepthook = excepthook

6
python/console/console_settings.py
View File

@ -18,16 +18,16 @@ email : lrssvtml (at) gmail (dot) com
***************************************************************************/
Some portions of code were taken from https://code.google.com/p/pydee/
"""
from builtins import range
from qgis.PyQt.QtCore import QCoreApplication, QSize, Qt
from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QTableWidgetItem
from qgis.PyQt.QtGui import QIcon, QFont, QColor, QFontDatabase
from .console_compile_apis import PrepareAPIDialog
from .ui_console_settings import Ui_SettingsDialogPythonConsole
from qgis.core import QgsSettings
from .console_compile_apis import PrepareAPIDialog
from .ui_console_settings import Ui_SettingsDialogPythonConsole
class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):