diff -r b0996e4a289e -r 1d8dd9706f46 Project/ProjectFormsBrowser.py
--- a/Project/ProjectFormsBrowser.py Fri Jan 01 16:11:36 2010 +0000
+++ b/Project/ProjectFormsBrowser.py Sat Jan 02 15:11:35 2010 +0000
@@ -16,10 +16,10 @@
from E4Gui.E4Application import e4App
-from ProjectBrowserModel import ProjectBrowserFileItem, \
+from .ProjectBrowserModel import ProjectBrowserFileItem, \
ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
ProjectBrowserFormType
-from ProjectBaseBrowser import ProjectBaseBrowser
+from .ProjectBaseBrowser import ProjectBaseBrowser
from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
import UI.PixmapCache
@@ -310,8 +310,8 @@
[ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem])
cnt = categories["sum"]
- bfcnt = categories[unicode(ProjectBrowserFileItem)]
- sdcnt = categories[unicode(ProjectBrowserSimpleDirectoryItem)]
+ bfcnt = categories[str(ProjectBrowserFileItem)]
+ sdcnt = categories[str(ProjectBrowserSimpleDirectoryItem)]
if cnt > 1 and cnt == bfcnt:
self.multiMenu.popup(self.mapToGlobal(coord))
elif cnt > 1 and cnt == sdcnt:
@@ -453,8 +453,7 @@
fileNames = []
for itm in self.getSelectedItems():
fileNames.append(itm.fileName())
- trfiles = self.project.pdata["TRANSLATIONS"][:]
- trfiles.sort()
+ trfiles = sorted(self.project.pdata["TRANSLATIONS"][:])
fileNames.extend([os.path.join(self.project.ppath, trfile) \
for trfile in trfiles \
if trfile.endswith('.qm')])
@@ -531,11 +530,11 @@
try:
shutil.copy(templateFile, fname)
- except IOError, e:
+ except IOError as e:
QMessageBox.critical(self,
self.trUtf8("New Form"),
self.trUtf8("<p>The new form file <b>{0}</b> could not be created.<br>"
- "Problem: {1}</p>").format(fname, unicode(e)))
+ "Problem: {1}</p>").format(fname, str(e)))
return
self.project.appendFile(fname)
@@ -579,7 +578,9 @@
self.compileProc.setReadChannel(QProcess.StandardOutput)
while self.compileProc and self.compileProc.canReadLine():
- self.buf += unicode(self.compileProc.readLine())
+ self.buf += str(self.compileProc.readLine(),
+ Preferences.getSystem("IOEncoding"),
+ 'replace')
def __readStderr(self):
"""
@@ -589,12 +590,12 @@
if self.compileProc is None:
return
- ioEncoding = str(Preferences.getSystem("IOEncoding"))
+ ioEncoding = Preferences.getSystem("IOEncoding")
self.compileProc.setReadChannel(QProcess.StandardError)
while self.compileProc and self.compileProc.canReadLine():
s = self.uicompiler + ': '
- error = unicode(self.compileProc.readLine(),
+ error = str(self.compileProc.readLine(),
ioEncoding, 'replace')
s += error
self.emit(SIGNAL('appendStderr'), s)
@@ -611,9 +612,9 @@
if exitStatus == QProcess.NormalExit and exitCode == 0 and self.buf:
ofn = os.path.join(self.project.ppath, self.compiledFile)
try:
- f = open(ofn, "wb")
+ f = open(ofn, "w")
for line in self.buf.splitlines():
- f.write(line.encode("utf8") + os.linesep)
+ f.write(line + os.linesep)
f.close()
if self.compiledFile not in self.project.pdata["SOURCES"]:
self.project.appendFile(ofn)
@@ -622,12 +623,12 @@
self.trUtf8("Form Compilation"),
self.trUtf8("The compilation of the form file"
" was successful."))
- except IOError, msg:
+ except IOError as msg:
if not self.noDialog:
QMessageBox.information(None,
self.trUtf8("Form Compilation"),
self.trUtf8("<p>The compilation of the form file failed.</p>"
- "<p>Reason: {0}</p>").format(unicode(msg)))
+ "<p>Reason: {0}</p>").format(str(msg)))
else:
if not self.noDialog:
QMessageBox.information(None,
@@ -723,7 +724,7 @@
if self.hooks["generateDialogCode"] is not None:
self.hooks["generateDialogCode"](filename)
else:
- from CreateDialogCodeDialog import CreateDialogCodeDialog
+ from .CreateDialogCodeDialog import CreateDialogCodeDialog
# change environment
sys.path.insert(0, self.project.getProjectPath())
@@ -907,4 +908,4 @@
"compileSelectedForms" : None,
"generateDialogCode" : None,
"newForm" : None,
- }
+ }
\ No newline at end of file
