aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Lacko <backup.rlacko@gmail.com>2014-04-19 15:25:48 +0200
committerRoman Lacko <backup.rlacko@gmail.com>2014-04-19 15:25:48 +0200
commitfb0e821459aebc451f005f82fbd4f01d7ec6fe7b (patch)
tree510fb97bb22f419613a056459cd56108a3feeb55
parentd749b86166e6c82e36d0a6fe75112e3799cc0f7e (diff)
Python 3 compatibility fixes
-rwxr-xr-xexamples/declarative/photoviewer/main.py4
-rwxr-xr-xexamples/declarative/signals/qmltopy1/main.py6
-rwxr-xr-xexamples/declarative/signals/qmltopy3/main.py4
-rwxr-xr-xexamples/declarative/signals/qmltopy4/main.py2
-rw-r--r--examples/hyperui/hyperuilib/shared/dataresource.py4
-rw-r--r--examples/itemviews/addressbook/adddialogwidget.py4
-rw-r--r--examples/itemviews/addressbook/newaddresstab.py4
-rwxr-xr-xexamples/widgets/movie/movie.py2
8 files changed, 15 insertions, 15 deletions
diff --git a/examples/declarative/photoviewer/main.py b/examples/declarative/photoviewer/main.py
index a69b1b1..48f981f 100755
--- a/examples/declarative/photoviewer/main.py
+++ b/examples/declarative/photoviewer/main.py
@@ -231,13 +231,13 @@ if __name__ == '__main__':
username, ok = QtGui.QInputDialog.getText(None, "Username", "Username:", QtGui.QLineEdit.Normal)
if not ok:
- print "Must provide a username"
+ print("Must provide a username")
sys.exit(1)
password, ok = QtGui.QInputDialog.getText(None, "Password", "Password:", QtGui.QLineEdit.Password)
if not ok:
- print "Must provide a password"
+ print("Must provide a password")
sys.exit(1)
data = Picasa(username, password)
diff --git a/examples/declarative/signals/qmltopy1/main.py b/examples/declarative/signals/qmltopy1/main.py
index bb9d7cb..bfbbe4c 100755
--- a/examples/declarative/signals/qmltopy1/main.py
+++ b/examples/declarative/signals/qmltopy1/main.py
@@ -54,15 +54,15 @@ class Console(QtCore.QObject):
As a temporary solution, use separate functions with one slot per
function.
"""
- print s
+ print(s)
@QtCore.Slot(str)
def outputStr(self, s):
- print s
+ print(s)
@QtCore.Slot('double')
def outputFloat(self, x):
- print x
+ print(x)
if __name__ == '__main__':
diff --git a/examples/declarative/signals/qmltopy3/main.py b/examples/declarative/signals/qmltopy3/main.py
index 0bce1d2..b9ac696 100755
--- a/examples/declarative/signals/qmltopy3/main.py
+++ b/examples/declarative/signals/qmltopy3/main.py
@@ -42,10 +42,10 @@ class Console(QtCore.QObject):
@QtCore.Slot('double')
def output(self,s):
- print s
+ print(s)
def sayThis(s):
- print s
+ print(s)
if __name__ == '__main__':
import sys
diff --git a/examples/declarative/signals/qmltopy4/main.py b/examples/declarative/signals/qmltopy4/main.py
index b98e7c1..6fd6904 100755
--- a/examples/declarative/signals/qmltopy4/main.py
+++ b/examples/declarative/signals/qmltopy4/main.py
@@ -39,7 +39,7 @@
from PySide import QtCore, QtGui, QtDeclarative
def sayThis(s):
- print s
+ print(s)
if __name__ == '__main__':
import sys
diff --git a/examples/hyperui/hyperuilib/shared/dataresource.py b/examples/hyperui/hyperuilib/shared/dataresource.py
index 3c2e244..28a101f 100644
--- a/examples/hyperui/hyperuilib/shared/dataresource.py
+++ b/examples/hyperui/hyperuilib/shared/dataresource.py
@@ -56,7 +56,7 @@ class Resource(object):
f = d._pixmapPrefix + path
p = QPixmap(f)
if p.isNull():
- print "Pixmap not found: ", f
+ print("Pixmap not found: " + f)
return p
@@ -78,7 +78,7 @@ class Resource(object):
if d._settings.contains(key):
return d._settings.value(key, value)
else:
- print "Resource: key '%s' not found" % key
+ print("Resource: key '%s' not found" % key)
@staticmethod
def intValue(key, value=0):
diff --git a/examples/itemviews/addressbook/adddialogwidget.py b/examples/itemviews/addressbook/adddialogwidget.py
index cfc86e8..3eca038 100644
--- a/examples/itemviews/addressbook/adddialogwidget.py
+++ b/examples/itemviews/addressbook/adddialogwidget.py
@@ -100,5 +100,5 @@ if __name__ == "__main__":
if (dialog.exec_()):
name = dialog.name
address = dialog.address
- print "Name:", name
- print "Address:", address
+ print("Name:" + name)
+ print("Address:" + address)
diff --git a/examples/itemviews/addressbook/newaddresstab.py b/examples/itemviews/addressbook/newaddresstab.py
index b960832..2b46fd7 100644
--- a/examples/itemviews/addressbook/newaddresstab.py
+++ b/examples/itemviews/addressbook/newaddresstab.py
@@ -82,8 +82,8 @@ class NewAddressTab(QWidget):
if __name__ == "__main__":
def printAddress(name, address):
- print "Name:", name
- print "Address:", address
+ print("Name:" + name)
+ print("Address:" + address)
import sys
from PySide.QtGui import QApplication
diff --git a/examples/widgets/movie/movie.py b/examples/widgets/movie/movie.py
index ad1e42e..d67b964 100755
--- a/examples/widgets/movie/movie.py
+++ b/examples/widgets/movie/movie.py
@@ -69,7 +69,7 @@ class MoviePlayer(QtGui.QWidget):
self.openFile(fileName)
def openFile(self, fileName):
- print "fileName:", fileName
+ print("fileName:" + fileName)
self.currentMovieDirectory = QtCore.QFileInfo(fileName).path()
self.movie.stop()