[libcryptui] Updating Python test scripts for Python 3 migration.
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libcryptui] Updating Python test scripts for Python 3 migration.
- Date: Wed, 24 Jul 2013 15:50:26 +0000 (UTC)
commit 0fd5f0b8db23924df1c13d14e3289d8d1e9100c5
Author: Russ Adams <russa arcatechsystems com>
Date: Sat Feb 23 14:34:57 2013 -0500
Updating Python test scripts for Python 3 migration.
tests/dbus-crypto-test.py | 16 ++++++++--------
tests/dbus-discover-test.py | 10 +++++-----
tests/dbus-display-notification-test.py | 4 ++--
tests/dbus-import.py | 12 ++++++------
tests/dbus-listen-keyset.py | 10 +++++-----
tests/dbus-match-test.py | 12 ++++++------
tests/dbus-test.py | 24 ++++++++++++------------
7 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/tests/dbus-crypto-test.py b/tests/dbus-crypto-test.py
index b16b1a5..d9370a6 100644
--- a/tests/dbus-crypto-test.py
+++ b/tests/dbus-crypto-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import dbus
@@ -6,24 +6,24 @@ bus = dbus.SessionBus()
proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
-print "\n\nSEAHORSE DBUS CALL ------------------------------------"
+print("\n\nSEAHORSE DBUS CALL ------------------------------------")
proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/crypto')
service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.CryptoService')
encrypted = service.EncryptText(["openpgp:A50CFA6E5DBAA916", "openpgp:A50CFA6E5DBAA916"], "", 0, "cleartext")
-print "Encrypted: ", encrypted
+print("Encrypted: ", encrypted)
(decrypted, signer) = service.DecryptText("openpgp", 0, encrypted)
-print "Decrypted: ", decrypted
-print "Signer: ", signer
+print("Decrypted: ", decrypted)
+print("Signer: ", signer)
signed = service.SignText("openpgp:A50CFA6E5DBAA916", 0, "cleartext")
-print "Signed: ", signed
+print("Signed: ", signed)
(verified, signer) = service.VerifyText("openpgp", 0, signed)
-print "Verified: ", verified
-print "Signer: ", signer
+print("Verified: ", verified)
+print("Signer: ", signer)
# Symmetric encryption
FLAG_SYMMETRIC = 0x02
diff --git a/tests/dbus-discover-test.py b/tests/dbus-discover-test.py
index f63ad37..2be70e4 100644
--- a/tests/dbus-discover-test.py
+++ b/tests/dbus-discover-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import dbus
@@ -6,11 +6,11 @@ bus = dbus.SessionBus()
proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
-print "\n\nALL DBUS SERVICES -------------------------------------"
-print dbus_iface.ListNames()
+print("\n\nALL DBUS SERVICES -------------------------------------")
+print(dbus_iface.ListNames())
-print "\n\nSEAHORSE DBUS CALL ------------------------------------"
+print("\n\nSEAHORSE DBUS CALL ------------------------------------")
proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys')
service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.KeyService')
@@ -18,4 +18,4 @@ proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys/openp
keyset = dbus.Interface(proxy_obj, "org.gnome.seahorse.Keys")
keys = keyset.DiscoverKeys(['E67A96AAEA0398B6', '786AF9FD33B46A1A'], 0)
-print keys
+print(keys)
diff --git a/tests/dbus-display-notification-test.py b/tests/dbus-display-notification-test.py
index 4615df4..7ea8dff 100644
--- a/tests/dbus-display-notification-test.py
+++ b/tests/dbus-display-notification-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import dbus
@@ -6,7 +6,7 @@ bus = dbus.SessionBus()
proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
-print "\n\nSEAHORSE DBUS CALL ------------------------------------"
+print("\n\nSEAHORSE DBUS CALL ------------------------------------")
proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys')
service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.KeyService')
diff --git a/tests/dbus-import.py b/tests/dbus-import.py
index 48ebdbb..6f8e7dd 100644
--- a/tests/dbus-import.py
+++ b/tests/dbus-import.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import dbus
import sys
@@ -7,18 +7,18 @@ bus = dbus.SessionBus()
proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
-print "\n\nALL DBUS SERVICES -------------------------------------"
-print dbus_iface.ListNames()
+print("\n\nALL DBUS SERVICES -------------------------------------")
+print(dbus_iface.ListNames())
if len(sys.argv) < 2:
- print "Specify data to import on command line"
+ print("Specify data to import on command line")
sys.exit(2)
data = open(sys.argv[1]).read()
-print "\n\nSEAHORSE DBUS CALL ------------------------------------"
+print("\n\nSEAHORSE DBUS CALL ------------------------------------")
proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys')
service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.KeyService')
keys = service.ImportKeys("openpgp", data)
-print keys
+print(keys)
diff --git a/tests/dbus-listen-keyset.py b/tests/dbus-listen-keyset.py
index 8966bda..4e29b22 100644
--- a/tests/dbus-listen-keyset.py
+++ b/tests/dbus-listen-keyset.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import gobject
import dbus
@@ -11,16 +11,16 @@ service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.Keys')
def signal_callback(interface, signal_name, service, path, message):
- print "Received signal %s from %s" % (signal_name, interface)
+ print("Received signal %s from %s" % (signal_name, interface))
def key_changed(id):
- print "Changed: ", id
+ print("Changed: ", id)
def key_added(id):
- print "Added: ", id
+ print("Added: ", id)
def key_removed(id):
- print "Removed: ", id
+ print("Removed: ", id)
service.connect_to_signal ('KeyChanged', key_changed)
service.connect_to_signal ('KeyAdded', key_added)
diff --git a/tests/dbus-match-test.py b/tests/dbus-match-test.py
index eebe54a..b95835e 100755
--- a/tests/dbus-match-test.py
+++ b/tests/dbus-match-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import dbus
@@ -6,11 +6,11 @@ bus = dbus.SessionBus()
proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
-print "\n\nALL DBUS SERVICES -------------------------------------"
-print dbus_iface.ListNames()
+print("\n\nALL DBUS SERVICES -------------------------------------")
+print(dbus_iface.ListNames())
-print "\n\nSEAHORSE DBUS CALL ------------------------------------"
+print("\n\nSEAHORSE DBUS CALL ------------------------------------")
proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys')
service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.KeyService')
@@ -18,6 +18,6 @@ proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys/openp
keyset = dbus.Interface(proxy_obj, "org.gnome.seahorse.Keys")
(keys, unmatched) = keyset.MatchKeys(['Stef Walter', 'sadam clemson edu', 'flooey blah com'], 0x00000010)
-print keys
-print unmatched
+print(keys)
+print(unmatched)
diff --git a/tests/dbus-test.py b/tests/dbus-test.py
index 8fd7fc4..4d3ef7c 100644
--- a/tests/dbus-test.py
+++ b/tests/dbus-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
import dbus
@@ -6,23 +6,23 @@ bus = dbus.SessionBus()
proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
-print "\n\nALL DBUS SERVICES -------------------------------------"
-print dbus_iface.ListNames()
+print("\n\nALL DBUS SERVICES -------------------------------------")
+print(dbus_iface.ListNames())
-print "\n\nSEAHORSE DBUS CALL ------------------------------------"
+print("\n\nSEAHORSE DBUS CALL ------------------------------------")
proxy_obj = bus.get_object('org.gnome.seahorse', '/org/gnome/seahorse/keys')
service = dbus.Interface(proxy_obj, 'org.gnome.seahorse.KeyService')
types = service.GetKeyTypes()
-print "GetKeyTypes(): ", types
+print("GetKeyTypes(): ", types)
if not len(types):
- print "No key types found"
+ print("No key types found")
sys.exit(0)
path = service.GetKeyset(types[0])
-print "GetKeySet(): ", path
+print("GetKeySet(): ", path)
proxy_obj = bus.get_object('org.gnome.seahorse', path)
keyset = dbus.Interface(proxy_obj, "org.gnome.seahorse.Keys")
@@ -30,10 +30,10 @@ keyset = dbus.Interface(proxy_obj, "org.gnome.seahorse.Keys")
keys = keyset.ListKeys()
if not len(keys):
- print "No keys found"
+ print("No keys found")
sys.exit(0)
-print keys[0]
-print keyset.GetKeyField(keys[0], "display-name")
-print keyset.GetKeyFields(keys[0], [ "display-name", "raw-id", "fingerprint" ])
-print service.ExportKeys("openpgp", [ keys[0] ])
+print(keys[0])
+print(keyset.GetKeyField(keys[0], "display-name"))
+print(keyset.GetKeyFields(keys[0], [ "display-name", "raw-id", "fingerprint" ]))
+print(service.ExportKeys("openpgp", [ keys[0] ]))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]