Merge lp:~phablet-team/ofono/mvno-oem-py3-changes into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

  * debian/control: adjust ofono-scripts dependencies for Python 3
  * plugins/ril, src/gprs.c,network.c,simutil.c: fix MVNO roaming
    Many MVNOs store their home networks in EF_SPDI. This
    was used correctly for displaying operator name, however
    some modems failed to handle roaming correctly for MVNOs.
    This fix is transparent to modems that do the right thing.
  * gril/gril.c, plugins/ril.c: API changes for OEMS
    This change introduces a socket-path to the g_ril_new()
    function, and also adds a new disconnect function.
  * gril/grilunsol.c: add support for v5 signal strength message
  * test: convert tests scripts to Python 3 (LP: #1283571)

This merge includes the following changes from our github auto-import tree:

1. MVNO Roaming Fix - some modems don't properly handle roaming when a MVNO SIM is used. This change should be transparent for modems that work correctly. AFAIK, the only way to test is to use a very specific MVNO SIM and a device with a semi-broken rild implementation. So, my best advice to you is to test normal scenarios and make sure there's been no regressions.

2. OEM preparation - minor change to gril API so that a socket path can be passed in when creating a new gril impl. Again, should be transparent. If this doesn't work, nothing else will...

3. Python3 changes - all of the ofono test scripts have been ported to Python3. They are not longer Python 2 compatible.

This merge has been tested on a mako running image #194.

[Tony Espy (awe)]

One annoying thing I noticed is that I get the following error for the python scripts during build:

python-script-but-no-python-dep

however the control file does have python deps for ofono-scripts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6855
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/25/rebuild

review: Approve (continuous-integration)

[lp:~phablet-team/ofono/mvno-oem-py3-changes]

6855. By Tony Espy on 2014-02-28

debian/control: adjust ofono-scripts dependencies for Python 3

6856. By Tony Espy on 2014-02-28

test/rilmodem: add copyright/license headers

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6856
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/26/rebuild

review: Approve (continuous-integration)

=== modified file '.gitignore'
--- .gitignore	2013-11-19 11:18:44 +0000
+++ .gitignore	2014-02-28 20:44:46 +0000
@@ -46,6 +46,7 @@
 unit/test-grilreply
 unit/test-grilrequest
 unit/test-grilunsol
+unit/test-mnclength
 
 tools/huawei-audio
 tools/auto-enable

=== modified file 'Makefile.am'
--- Makefile.am	2014-01-08 20:15:24 +0000
+++ Makefile.am	2014-02-28 20:44:46 +0000
@@ -681,7 +681,11 @@
 		test/release-and-swap \
 		test/hold-and-answer \
 		test/hangup-multiparty \
-		test/hangup-call
+		test/hangup-call \
+		test/rilmodem/test-hangup \
+		test/rilmodem/test-modem-offline \
+		test/rilmodem/test-sim-online
+
 
 if TEST
 testdir = $(pkglibdir)/test

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-28 20:44:46 +0000
+++ debian/changelog	2014-02-28 20:44:46 +0000
@@ -9,20 +9,38 @@
     systems via an ifdef, which leaves unused functions
     and data.  This change exends the ifdef to cover
     the unused functions and test data.
-   * gril, rilmodem/sim, unit: fix SIM IO crash (LP: #1268743)
+  * gril, rilmodem/sim, unit: fix SIM IO crash (LP: #1268743)
      - cleanup gril_reply_parse_sim_io() to add malformed parcel
        check and fix memory leak.
      - add check for null hex_response in ril_file_io_cb(), as
        the emulator can return such responses.
      - add additional unit tests to cover crash scenarios.
-   * ril, src: enable message-waiting-interface
+  * ril, src: enable message-waiting-interface
      - register message_waiting atom in ril plugin
      - fix sms_mwi_dcs_decode bug which prevented incoming message
        waiting indications from being set.
-   * rilmodem/voicecall: fix call-decline bug (LP: #1260988)
+  * rilmodem/voicecall: fix call-decline bug (LP: #1260988)
      Send a RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND instead of
      RIL_REQUEST_HANGUP for incoming calls.
 
+  [ Alfonso Sanchez-Beato ]
+  * plugins/ril, src/gprs.c,network.c,simutil.c: fix MVNO roaming
+    Many MVNOs store their home networks in EF_SPDI.  This
+    was used correctly for displaying operator name, however
+    some modems failed to handle roaming correctly for MVNOs.
+    This fix is transparent to modems that do the right thing.
+  * gril/gril.c, plugins/ril.c: API changes for OEMS
+    This change introduces a socket-path to the g_ril_new()
+    function, and also adds a new disconnect function.
+  * gril/grilunsol.c: add support for v5 signal strength message
+
+  [ Martin Pitt ]
+  * test: convert tests scripts to Python 3 (LP: #1283571)
+
+  [ Tony Espy ]
+  * debian/control: adjust ofono-scripts dependencies for Python 3
+  * test/rilmodem: add copyright/license headers
+
  -- Tony Espy <[e-mail]>  Tue, 21 Jan 2014 13:54:46 -0500
 
 ofono (1.12+bzr6851-0ubuntu1) trusty; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-10-02 15:34:41 +0000
+++ debian/control	2014-02-28 20:44:46 +0000
@@ -77,9 +77,9 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ofono (>= ${source:Version}),
-         python,
-         python-dbus,
-         python-gobject-2,
+	 python3,
+	 python-dbus,
+	 python3-gi
 Description: Mobile telephony stack (test and maintenance script files)
  oFono is a stack for mobile telephony devices on Linux.  oFono supports
  speaking to telephony devices through specific drivers, or with generic

=== modified file 'gril/gril.c'
--- gril/gril.c	2013-12-18 20:02:51 +0000
+++ gril/gril.c	2014-02-28 20:44:46 +0000
@@ -51,9 +51,6 @@
 #define COMMAND_FLAG_EXPECT_PDU			0x1
 #define COMMAND_FLAG_EXPECT_SHORT_PROMPT	0x2
 
-#define RILD_CMD_SOCKET "/dev/socket/rild"
-#define RILD_DBG_SOCKET "/dev/socket/rild-debug"
-
 struct ril_request {
 	gchar *data;
 	guint data_len;
@@ -93,7 +90,6 @@
 	GRilDisconnectFunc user_disconnect;	/* user disconnect func */
 	gpointer user_disconnect_data;		/* user disconnect data */
 	guint read_so_far;			/* Number of bytes processed */
-	gboolean connected;			/* RIL_UNSOL_CONNECTED rvcd */
 	gboolean suspended;			/* Are we suspended? */
 	GRilDebugFunc debugf;			/* debugging output function */
 	gpointer debug_data;			/* Data to pass to debug func */
@@ -294,8 +290,6 @@
 	g_queue_free(p->out_queue);
 	p->out_queue = NULL;
 
-	p->connected = FALSE;
-
 	/* Cleanup registered notifications */
 	if (p->notify_list)
 		g_hash_table_destroy(p->notify_list);
@@ -308,6 +302,13 @@
 	}
 }
 
+void g_ril_set_disconnect_function(GRil *ril, GRilDisconnectFunc disconnect,
+					gpointer user_data)
+{
+	ril->parent->user_disconnect = disconnect;
+	ril->parent->user_disconnect_data = user_data;
+}
+
 static void io_disconnect(gpointer user_data)
 {
 	struct ril_s *ril = user_data;
@@ -396,9 +397,6 @@
 
 	g_hash_table_iter_init(&iter, p->notify_list);
 
-	if (message->req == RIL_UNSOL_RIL_CONNECTED)
-		p->connected = TRUE;
-
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
 		req_key = *((int *)key);
 		notify = value;
@@ -767,7 +765,7 @@
 	return FALSE;
 }
 
-static struct ril_s *create_ril()
+static struct ril_s *create_ril(const char *sock_path)
 
 {
 	struct ril_s *ril;
@@ -786,7 +784,6 @@
 	ril->debugf = NULL;
 	ril->req_bytes_written = 0;
 	ril->trace = FALSE;
-	ril->connected = FALSE;
 
 	sk = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (sk < 0) {
@@ -797,7 +794,7 @@
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;
-	strncpy(addr.sun_path, RILD_CMD_SOCKET, sizeof(addr.sun_path) - 1);
+	strncpy(addr.sun_path, sock_path, sizeof(addr.sun_path) - 1);
 
 	if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 		ofono_error("create_ril: can't connect to RILD: %s (%d)\n",
@@ -913,7 +910,6 @@
 {
 	struct ril_notify *notify;
 	struct ril_notify_node *node;
-	struct ril_msg message;
 
 	if (ril->notify_list == NULL)
 		return 0;
@@ -940,19 +936,6 @@
 
 	notify->nodes = g_slist_prepend(notify->nodes, node);
 
-	if ((req == RIL_UNSOL_RIL_CONNECTED) && (ril->connected == TRUE)) {
-		/* fire the callback in a timer, as it won't ever fire */
-		DBG("CONNECTED already received... ");
-
-		message.req = RIL_UNSOL_RIL_CONNECTED;
-		message.unsolicited = TRUE;
-		message.buf_len = 0;
-		message.buf = NULL;
-
-		func(&message, user_data);
-	}
-
-
 	return node->id;
 }
 
@@ -1011,7 +994,7 @@
 	rilp->malformed = 0;
 }
 
-GRil *g_ril_new()
+GRil *g_ril_new(const char *sock_path)
 {
 	GRil *ril;
 
@@ -1019,7 +1002,7 @@
 	if (ril == NULL)
 		return NULL;
 
-	ril->parent = create_ril();
+	ril->parent = create_ril(sock_path);
 	if (ril->parent == NULL) {
 		g_free(ril);
 		return NULL;

=== modified file 'gril/gril.h'
--- gril/gril.h	2013-12-09 17:09:20 +0000
+++ gril/gril.h	2014-02-28 20:44:46 +0000
@@ -93,7 +93,7 @@
 
 void g_ril_init_parcel(const struct ril_msg *message, struct parcel *rilp);
 
-GRil *g_ril_new();
+GRil *g_ril_new(const char *sock_path);
 
 GIOChannel *g_ril_get_channel(GRil *ril);
 GRilIO *g_ril_get_io(GRil *ril);
@@ -103,7 +103,7 @@
 
 GRil *g_ril_clone(GRil *ril);
 
-gboolean g_ril_set_disconnect_function(GRil *ril, GRilDisconnectFunc disconnect,
+void g_ril_set_disconnect_function(GRil *ril, GRilDisconnectFunc disconnect,
 					gpointer user_data);
 
 gboolean g_ril_get_trace(GRil *ril);

=== modified file 'gril/grilunsol.c'
--- gril/grilunsol.c	2014-01-08 08:32:56 +0000
+++ gril/grilunsol.c	2014-02-28 20:44:46 +0000
@@ -264,6 +264,7 @@
 
 	return radio_state;
 }
+
 int g_ril_unsol_parse_signal_strength(GRil *gril, const struct ril_msg *message)
 {
 	struct parcel rilp;
@@ -271,7 +272,7 @@
 
 	g_ril_init_parcel(message, &rilp);
 
-	/* RIL_SignalStrength_v6 */
+	/* RIL_SignalStrength_v5 */
 	/* GW_SignalStrength */
 	gw_signal = parcel_r_int32(&rilp);
 	parcel_r_int32(&rilp); /* bitErrorRate */
@@ -285,12 +286,17 @@
 	parcel_r_int32(&rilp); /* ecio */
 	parcel_r_int32(&rilp); /* signalNoiseRatio */
 
-	/* LTE_SignalStrength */
-	lte_signal = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* rsrp */
-	parcel_r_int32(&rilp); /* rsrq */
-	parcel_r_int32(&rilp); /* rssnr */
-	parcel_r_int32(&rilp); /* cqi */
+	/* Present only for RIL_SignalStrength_v6 or newer */
+	if (parcel_data_avail(&rilp) > 0) {
+		/* LTE_SignalStrength */
+		lte_signal = parcel_r_int32(&rilp);
+		parcel_r_int32(&rilp); /* rsrp */
+		parcel_r_int32(&rilp); /* rsrq */
+		parcel_r_int32(&rilp); /* rssnr */
+		parcel_r_int32(&rilp); /* cqi */
+	} else {
+		lte_signal = -1;
+	}
 
 	g_ril_append_print_buf(gril, "(gw: %d, cdma: %d, evdo: %d, lte: %d)",
 				gw_signal, cdma_dbm, evdo_dbm, lte_signal);

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2014-02-28 20:44:46 +0000
+++ plugins/ril.c	2014-02-28 20:44:46 +0000
@@ -65,6 +65,8 @@
 
 #define MAX_SIM_STATUS_RETRIES 15
 
+#define RILD_CMD_SOCKET "/dev/socket/rild"
+
 struct ril_data {
 	GRil *modem;
 	int sim_status_retries;
@@ -366,7 +368,7 @@
 
 	DBG("");
 
-	ril->modem = g_ril_new();
+	ril->modem = g_ril_new(RILD_CMD_SOCKET);
 
 	/* NOTE: Since AT modems open a tty, and then call
 	 * g_at_chat_new(), they're able to return -EIO if

=== modified file 'src/gprs.c'
--- src/gprs.c	2013-11-15 23:15:52 +0000
+++ src/gprs.c	2014-02-28 20:44:46 +0000
@@ -2112,6 +2112,13 @@
 {
 	DBG("%s status %d", __ofono_atom_get_path(gprs->atom), status);
 
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING &&
+			ofono_netreg_get_status(gprs->netreg) ==
+			NETWORK_REGISTRATION_STATUS_REGISTERED) {
+		DBG("MVNO: roaming -> registered");
+		status = NETWORK_REGISTRATION_STATUS_REGISTERED;
+	}
+
 	gprs->status = status;
 
 	if (status != NETWORK_REGISTRATION_STATUS_REGISTERED &&

=== modified file 'src/network.c'
--- src/network.c	2013-11-15 23:15:52 +0000
+++ src/network.c	2014-02-28 20:44:46 +0000
@@ -117,6 +117,20 @@
 	return "unknown";
 }
 
+static int get_display_status(struct ofono_netreg *netreg, int status)
+{
+	struct network_operator_data *opd = netreg->current_operator;
+
+	/* Networks in EF_SPDI are equivalent to a home network */
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING && opd != NULL &&
+			sim_spdi_lookup(netreg->spdi, opd->mcc, opd->mnc)) {
+		DBG("mcc+mnc found in SPDI, roaming -> registered");
+		status = NETWORK_REGISTRATION_STATUS_REGISTERED;
+	}
+
+	return status;
+}
+
 static char **network_operator_technologies(struct network_operator_data *opd)
 {
 	unsigned int ntechs = 0;
@@ -1038,11 +1052,14 @@
 
 static void set_registration_status(struct ofono_netreg *netreg, int status)
 {
-	const char *str_status = registration_status_to_string(status);
+	const char *str_status;
 	const char *path = __ofono_atom_get_path(netreg->atom);
 	DBusConnection *conn = ofono_dbus_get_connection();
 
-	netreg->status = status;
+	/* Status depends also on SIM files */
+	netreg->status = get_display_status(netreg, status);
+
+	str_status = registration_status_to_string(netreg->status);
 
 	ofono_dbus_signal_property_changed(conn, path,
 					OFONO_NETWORK_REGISTRATION_INTERFACE,
@@ -1296,6 +1313,9 @@
 		}
 	}
 
+	/* Registration status might be affected for MVNOs */
+	set_registration_status(netreg, netreg->status);
+
 	notify_status_watches(netreg);
 }
 
@@ -1643,7 +1663,17 @@
 				netreg->current_operator->mnc))
 		return;
 
+	/*
+	 * SPDI contents affect the displayed operator AND whether we consider
+	 * that we are roaming or not.
+	 */
+
 	netreg_emit_operator_display_name(netreg);
+
+	/* Registration status might be affected for MVNOs */
+	set_registration_status(netreg, netreg->status);
+
+	notify_status_watches(netreg);
 }
 
 static void sim_spn_display_condition_parse(struct ofono_netreg *netreg,

=== modified file 'src/simutil.c'
--- src/simutil.c	2012-11-25 14:34:41 +0000
+++ src/simutil.c	2014-02-28 20:44:46 +0000
@@ -767,12 +767,14 @@
 					gboolean *add_ci)
 {
 	char *ret = NULL;
-	unsigned char *endp;
 	unsigned char dcs;
 	int i;
 	gboolean ci = FALSE;
+	unsigned char *unpacked_buf;
+	long num_char, written;
+	int spare_bits;
 
-	if (length < 1)
+	if (length < 2)
 		return NULL;
 
 	dcs = *buffer++;
@@ -787,11 +789,18 @@
 
 	switch (dcs & (7 << 4)) {
 	case 0x00:
-		endp = memchr(buffer, 0xff, length);
-		if (endp)
-			length = endp - buffer;
-		ret = convert_gsm_to_utf8(buffer, length,
-				NULL, NULL, 0xff);
+		spare_bits = dcs & 0x07;
+		num_char = (length * 8 - spare_bits) / 7;
+
+		unpacked_buf = unpack_7bit(buffer, length, 0, FALSE,
+						num_char, &written, 0);
+		if (unpacked_buf == NULL)
+			break;
+
+		ret = convert_gsm_to_utf8(unpacked_buf, written, NULL, NULL, 0);
+
+		g_free(unpacked_buf);
+
 		break;
 	case 0x10:
 		if ((length % 2) == 1) {

=== modified file 'test/activate-context'
--- test/activate-context	2011-07-24 23:49:06 +0000
+++ test/activate-context	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -20,7 +20,7 @@
 	contexts = connman.GetContexts()
 
 	if (len(contexts) == 0):
-		print "No context available"
+		print("No context available")
 		sys.exit(1)
 
 	connman.SetProperty("Powered", dbus.Boolean(1))
@@ -35,6 +35,6 @@
 
 	try:
 		context.SetProperty("Active", dbus.Boolean(1), timeout = 100)
-	except dbus.DBusException, e:
-		print "Error activating %s: %s" % (path, str(e))
+	except dbus.DBusException as e:
+		print("Error activating %s: %s" % (path, str(e)))
 		exit(2)

=== modified file 'test/answer-calls'
--- test/answer-calls	2010-09-26 14:25:20 +0000
+++ test/answer-calls	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,7 +22,7 @@
 
 	for path, properties in calls:
 		state = properties["State"]
-		print "[ %s ] %s" % (path, state)
+		print("[ %s ] %s" % (path, state))
 
 		if state != "incoming":
 			continue

=== modified file 'test/backtrace'
--- test/backtrace	2010-08-20 12:44:54 +0000
+++ test/backtrace	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import re
@@ -6,7 +6,7 @@
 import subprocess
 
 if (len(sys.argv) < 3):
-	print "Usage: %s [binary] [log]" % (sys.argv[0])
+	print("Usage: %s [binary] [log]" % (sys.argv[0]))
 	sys.exit(1)
 
 binary = sys.argv[1]
@@ -50,8 +50,8 @@
 frame_count = len(frames);
 
 count = 0
-print "-------- backtrace --------"
+print("-------- backtrace --------")
 while count < frame_count:
-	print "[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1])
+	print("[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1]))
 	count = count + 2
-print "---------------------------"
+print("---------------------------")

=== modified file 'test/cancel-ussd'
--- test/cancel-ussd	2011-06-06 20:09:08 +0000
+++ test/cancel-ussd	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -21,7 +21,7 @@
 properties = ussd.GetProperties()
 state = properties["State"]
 
-print "State: %s" % (state)
+print("State: %s" % (state))
 
 if state != "idle":
 	ussd.Cancel()

=== modified file 'test/cdma-connman-disable'
--- test/cdma-connman-disable	2011-03-17 19:18:56 +0000
+++ test/cdma-connman-disable	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Disconnecting CDMA Packet Data Service on modem %s..." % path
+print("Disconnecting CDMA Packet Data Service on modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.cdma.ConnectionManager')
 

=== modified file 'test/cdma-connman-enable'
--- test/cdma-connman-enable	2011-03-17 19:18:56 +0000
+++ test/cdma-connman-enable	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Connecting CDMA Packet Data Service on modem %s..." % path
+print("Connecting CDMA Packet Data Service on modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.cdma.ConnectionManager')
 

=== modified file 'test/cdma-dial-number'
--- test/cdma-dial-number	2011-01-13 22:07:12 +0000
+++ test/cdma-dial-number	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -16,7 +16,7 @@
 	path, properties = modems[0]
 	number = sys.argv[1]
 
-print "Using modem %s" % path
+print("Using modem %s" % path)
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.cdma.VoiceCallManager')

=== modified file 'test/cdma-hangup'
--- test/cdma-hangup	2011-01-13 22:07:12 +0000
+++ test/cdma-hangup	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

=== modified file 'test/cdma-list-call'
--- test/cdma-list-call	2011-01-13 22:07:12 +0000
+++ test/cdma-list-call	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.cdma.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,4 +22,4 @@
 
 	for key in properties.keys():
 		val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))

=== modified file 'test/cdma-set-credentials'
--- test/cdma-set-credentials	2011-07-27 14:32:55 +0000
+++ test/cdma-set-credentials	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -17,12 +17,12 @@
 	cm = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.cdma.ConnectionManager')
 
-	print "Connecting CDMA Packet Data Service on modem %s..." % path
+	print("Connecting CDMA Packet Data Service on modem %s..." % path)
 
 	if len(sys.argv) > 1:
 		cm.SetProperty("Username", (sys.argv[1]))
-		print "Setting Username to %s" % (sys.argv[1])
+		print("Setting Username to %s" % (sys.argv[1]))
 
 	if len(sys.argv) > 2:
 		cm.SetProperty("Password", (sys.argv[2]))
-		print "Setting Password to %s" % (sys.argv[2])
+		print("Setting Password to %s" % (sys.argv[2]))

=== modified file 'test/change-pin'
--- test/change-pin	2012-06-19 17:19:23 +0000
+++ test/change-pin	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -19,10 +19,10 @@
 	old_pin = sys.argv[2]
 	new_pin = sys.argv[3]
 else:
-	print "%s [PATH] pin_type old_pin new_pin" % (sys.argv[0])
+	print("%s [PATH] pin_type old_pin new_pin" % (sys.argv[0]))
 	sys.exit(0)
 
-print "Change %s for modem %s..." % (pin_type, path)
+print("Change %s for modem %s..." % (pin_type, path))
 
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')

=== modified file 'test/create-internet-context'
--- test/create-internet-context	2010-10-26 20:25:09 +0000
+++ test/create-internet-context	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -27,21 +27,21 @@
 
 	if path == "":
 		path = connman.AddContext("internet")
-		print "Created new context %s" % (path)
+		print("Created new context %s" % (path))
 	else:
-		print "Found context %s" % (path)
+		print("Found context %s" % (path))
 
 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')
 
 	if len(sys.argv) > 1:
 		context.SetProperty("AccessPointName", sys.argv[1])
-		print "Setting APN to %s" % (sys.argv[1])
+		print("Setting APN to %s" % (sys.argv[1]))
 
 	if len(sys.argv) > 2:
 		context.SetProperty("Username", sys.argv[2])
-		print "Setting username to %s" % (sys.argv[2])
+		print("Setting username to %s" % (sys.argv[2]))
 
 	if len(sys.argv) > 3:
 		context.SetProperty("Password", sys.argv[3])
-		print "Setting password to %s" % (sys.argv[3])
+		print("Setting password to %s" % (sys.argv[3]))

=== modified file 'test/create-mms-context'
--- test/create-mms-context	2010-10-26 20:25:09 +0000
+++ test/create-mms-context	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -27,21 +27,21 @@
 
 	if path == "":
 		path = connman.AddContext("mms")
-		print "Created new context %s" % (path)
+		print("Created new context %s" % (path))
 	else:
-		print "Found context %s" % (path)
+		print("Found context %s" % (path))
 
 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')
 
 	if len(sys.argv) > 1:
 		context.SetProperty("AccessPointName", sys.argv[1])
-		print "Setting APN to %s" % (sys.argv[1])
+		print("Setting APN to %s" % (sys.argv[1]))
 
 	if len(sys.argv) > 2:
 		context.SetProperty("Username", sys.argv[2])
-		print "Setting username to %s" % (sys.argv[2])
+		print("Setting username to %s" % (sys.argv[2]))
 
 	if len(sys.argv) > 3:
 		context.SetProperty("Password", sys.argv[3])
-		print "Setting password to %s" % (sys.argv[3])
+		print("Setting password to %s" % (sys.argv[3]))

=== modified file 'test/create-multiparty'
--- test/create-multiparty	2010-09-09 19:38:14 +0000
+++ test/create-multiparty	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -18,4 +18,4 @@
 mpty = manager.CreateMultiparty()
 
 for path in mpty:
-	print path
+	print(path)

=== modified file 'test/deactivate-all'
--- test/deactivate-all	2010-10-25 21:32:49 +0000
+++ test/deactivate-all	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

=== modified file 'test/deactivate-context'
--- test/deactivate-context	2010-10-21 19:46:32 +0000
+++ test/deactivate-context	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -20,7 +20,7 @@
 	contexts = connman.GetContexts()
 
 	if (len(contexts) == 0):
-		print "No context available"
+		print("No context available")
 		sys.exit(1)
 
 	if len(sys.argv) > 1:
@@ -33,6 +33,6 @@
 
 	try:
 		context.SetProperty("Active", dbus.Boolean(0))
-	except dbus.DBusException, e:
-		print "Error activating %s: %s" % (path, str(e))
+	except dbus.DBusException as e:
+		print("Error activating %s: %s" % (path, str(e)))
 		exit(2)

=== modified file 'test/dial-number'
--- test/dial-number	2011-03-14 14:24:59 +0000
+++ test/dial-number	2014-02-28 20:44:46 +0000
@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s [modem] <number> [hide_callerid]" % (sys.argv[0])
+	print("Usage: %s [modem] <number> [hide_callerid]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -32,11 +32,11 @@
 	number = sys.argv[2]
 	hide_callerid = sys.argv[3]
 
-print "Using modem %s" % modem
+print("Using modem %s" % modem)
 
 vcm = dbus.Interface(bus.get_object('org.ofono', modem),
 						'org.ofono.VoiceCallManager')
 
 path = vcm.Dial(number, hide_callerid)
 
-print path
+print(path)

=== modified file 'test/disable-call-forwarding'
--- test/disable-call-forwarding	2011-01-14 10:30:37 +0000
+++ test/disable-call-forwarding	2014-02-28 20:44:46 +0000
@@ -1,24 +1,24 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
 	if len(value.__str__()) > 0:
-		print "CF property %s changed to %s" % (property, value)
+		print("CF property %s changed to %s" % (property, value))
 	else:
-		print "CF property %s changed to disabled" % (property)
+		print("CF property %s changed to disabled" % (property))
 
 	if canexit:
 		mainloop.quit();
 
 if __name__ == "__main__":
 	if len(sys.argv) < 2:
-		print "Usage: %s <type>" % (sys.argv[0])
-		print "Type can be: all, conditional"
+		print("Usage: %s <type>" % (sys.argv[0]))
+		print("Type can be: all, conditional")
 		sys.exit(1)
 
 	canexit = False
@@ -41,13 +41,13 @@
 
 	try:
 		cf.DisableAll(type, timeout = 100)
-	except dbus.DBusException, e:
-		print "Unable to DisableAll", e
+	except dbus.DBusException as e:
+		print("Unable to DisableAll %s" % e)
 		sys.exit(1);
 
-	print "DisableAll successful"
+	print("DisableAll successful")
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/disable-gprs'
--- test/disable-gprs	2010-09-10 15:52:50 +0000
+++ test/disable-gprs	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Disconnecting GPRS on modem %s..." % path
+print("Disconnecting GPRS on modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.ConnectionManager')
 

=== modified file 'test/disable-modem'
--- test/disable-modem	2011-08-07 14:36:34 +0000
+++ test/disable-modem	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Disconnecting modem %s..." % path
+print("Disconnecting modem %s..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.Modem')
 

=== modified file 'test/dundee-connect'
--- test/dundee-connect	2012-05-22 16:44:46 +0000
+++ test/dundee-connect	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	devices = manager.GetDevices()
 	path = devices[0][0]
 
-print "Connect device %s..." % path
+print("Connect device %s..." % path)
 device = dbus.Interface(bus.get_object('org.ofono.dundee', path),
 						'org.ofono.dundee.Device')
 

=== modified file 'test/dundee-disconnect'
--- test/dundee-disconnect	2012-05-22 16:44:46 +0000
+++ test/dundee-disconnect	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	devices = manager.GetDevices()
 	path = devices[0][0]
 
-print "Disonnect device %s..." % path
+print("Disonnect device %s..." % path)
 device = dbus.Interface(bus.get_object('org.ofono.dundee', path),
 						'org.ofono.dundee.Device')
 

=== modified file 'test/enable-cbs'
--- test/enable-cbs	2010-09-09 19:38:14 +0000
+++ test/enable-cbs	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Enabling cell broadcast on modem %s..." % path
+print("Enabling cell broadcast on modem %s..." % path)
 cbs = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.CellBroadcast')
 

=== modified file 'test/enable-gprs'
--- test/enable-gprs	2010-09-10 15:52:50 +0000
+++ test/enable-gprs	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Connecting modem %s..." % path
+print("Connecting modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.ConnectionManager')
 

=== modified file 'test/enable-modem'
--- test/enable-modem	2011-08-07 14:36:34 +0000
+++ test/enable-modem	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Connecting modem %s..." % path
+print("Connecting modem %s..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.Modem')
 

=== modified file 'test/enter-pin'
--- test/enter-pin	2010-12-08 13:03:01 +0000
+++ test/enter-pin	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -17,10 +17,10 @@
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
-	print "%s [PATH] pin_type pin" % (sys.argv[0])
+	print("%s [PATH] pin_type pin" % (sys.argv[0]))
 	sys.exit(0)
 
-print "Enter Pin for modem %s..." % path
+print("Enter Pin for modem %s..." % path)
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')
 

=== modified file 'test/get-icon'
--- test/get-icon	2012-11-25 14:02:23 +0000
+++ test/get-icon	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -8,7 +8,7 @@
 if len(sys.argv) == 2:
 	id = sys.argv[1]
 else:
-	print "%s <icon id>" % (sys.argv[0])
+	print("%s <icon id>" % (sys.argv[0]))
 	sys.exit(0)
 
 manager = dbus.Interface(bus.get_object("org.ofono", "/"),
@@ -28,4 +28,4 @@
 xpm = ""
 for byte in icon:
 	xpm += str(byte)
-print xpm
+print(xpm)

=== modified file 'test/get-operators'
--- test/get-operators	2010-09-09 19:38:14 +0000
+++ test/get-operators	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -22,7 +22,7 @@
 	path = entry[0]
 	properties = entry[1]
 
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	for key in properties.keys():
 		if key in ["Technologies"]:
@@ -31,7 +31,7 @@
 				val += i + " "
 		else:
 			val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
-	print
+	print()
 

=== modified file 'test/get-tech-preference'
--- test/get-tech-preference	2010-09-09 19:38:14 +0000
+++ test/get-tech-preference	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus, sys
 
@@ -17,4 +17,4 @@
 
 properties = radiosettings.GetProperties()
 
-print "Technology preference: %s" % (properties["TechnologyPreference"])
+print("Technology preference: %s" % (properties["TechnologyPreference"]))

=== modified file 'test/hangup-active'
--- test/hangup-active	2011-02-03 16:20:23 +0000
+++ test/hangup-active	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -18,7 +18,7 @@
 
 for path, properties in calls:
 		state = properties["State"]
-		print "[ %s ] %s" % (path, state)
+		print("[ %s ] %s" % (path, state))
 
 		if state != "active":
 			continue

=== modified file 'test/hangup-all'
--- test/hangup-all	2011-03-14 14:25:52 +0000
+++ test/hangup-all	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

=== modified file 'test/hangup-call'
--- test/hangup-call	2012-08-06 15:52:23 +0000
+++ test/hangup-call	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -6,7 +6,7 @@
 bus = dbus.SystemBus()
 
 if (len(sys.argv) < 2):
-	print "Usage: %s [ Call Path ]" % (sys.argv[0])
+	print("Usage: %s [ Call Path ]" % (sys.argv[0]))
 	sys.exit(1)
 
 call = dbus.Interface(bus.get_object('org.ofono', sys.argv[1]),

=== modified file 'test/hangup-multiparty'
--- test/hangup-multiparty	2012-08-03 16:56:34 +0000
+++ test/hangup-multiparty	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

=== modified file 'test/hold-and-answer'
--- test/hold-and-answer	2012-08-02 19:23:34 +0000
+++ test/hold-and-answer	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

=== modified file 'test/initiate-ussd'
--- test/initiate-ussd	2011-06-06 20:09:39 +0000
+++ test/initiate-ussd	2014-02-28 20:44:46 +0000
@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s [modem] <ussd-string>" % (sys.argv[0])
+	print("Usage: %s [modem] <ussd-string>" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -27,7 +27,7 @@
 properties = ussd.GetProperties()
 state = properties["State"]
 
-print "State: %s" % (state)
+print("State: %s" % (state))
 
 if state != "idle":
 	sys.exit(1);
@@ -37,22 +37,22 @@
 properties = ussd.GetProperties()
 state = properties["State"]
 
-print result[0] + ": " + result[1]
+print(result[0] + ": " + result[1])
 
 if state == "idle":
 	sys.exit(0)
 
-print "State: %s" % (state)
+print("State: %s" % (state))
 
 while state == "user-response":
-	response = raw_input("Enter response: ")
+	response = input("Enter response: ")
 
 	result = ussd.Respond(response, timeout=100)
 
 	properties = ussd.GetProperties()
 	state = properties["State"]
 
-	print result
+	print(result)
 
 	if state != "idle":
-		print "State: %s" % (state)
+		print("State: %s" % (state))

=== modified file 'test/list-calls'
--- test/list-calls	2012-09-12 04:27:14 +0000
+++ test/list-calls	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -21,11 +21,11 @@
 	calls = mgr.GetCalls()
 
 	for path, properties in calls:
-		print "    [ %s ]" % (path)
+		print("    [ %s ]" % (path))
 
 		for key in properties.keys():
 			if key == 'Icon':
-				print "        %s = %d" % (key, properties[key])
+				print("        %s = %d" % (key, properties[key]))
 			else:
 				val = str(properties[key])
-				print "        %s = %s" % (key, val)
+				print("        %s = %s" % (key, val))

=== modified file 'test/list-contexts'
--- test/list-contexts	2011-03-15 22:11:59 +0000
+++ test/list-contexts	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
@@ -21,7 +21,7 @@
 	contexts = connman.GetContexts()
 
 	for path, properties in contexts:
-		print "    [ %s ]" % (path)
+		print("    [ %s ]" % (path))
 
 		for key in properties.keys():
 			if key in ["Settings"] or key in ["IPv6.Settings"]:
@@ -39,6 +39,6 @@
 				val += " }"
 			else:
 				val = str(properties[key])
-			print "        %s = %s" % (key, val)
+			print("        %s = %s" % (key, val))
 
-		print
+		print()

=== modified file 'test/list-messages'
--- test/list-messages	2011-01-29 02:29:15 +0000
+++ test/list-messages	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.MessageManager" not in properties["Interfaces"]:
 		continue
@@ -21,10 +21,10 @@
 	contexts = connman.GetMessages()
 
 	for path, properties in contexts:
-		print "    [ %s ]" % (path)
+		print("    [ %s ]" % (path))
 
 		for key in properties.keys():
 			val = str(properties[key])
-			print "        %s = %s" % (key, val)
+			print("        %s = %s" % (key, val))
 
-		print
+		print()

=== modified file 'test/list-modems'
--- test/list-modems	2012-12-17 15:50:22 +0000
+++ test/list-modems	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	for key in properties.keys():
 		if key in ["Interfaces", "Features"]:
@@ -19,13 +19,13 @@
 				val += i + " "
 		else:
 			val = properties[key]
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
 	for interface in properties["Interfaces"]:
 		object = dbus.Interface(bus.get_object('org.ofono', path),
 								interface)
 
-		print "    [ %s ]" % (interface)
+		print("    [ %s ]" % (interface))
 
 		try:
 			properties = object.GetProperties()
@@ -77,6 +77,6 @@
 				val += " }"
 			else:
 				val = properties[key]
-			print "        %s = %s" % (key, val)
+			print("        %s = %s" % (key, val))
 
-	print
+	print()

=== modified file 'test/list-operators'
--- test/list-operators	2010-09-09 19:38:14 +0000
+++ test/list-operators	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -11,7 +11,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.NetworkRegistration" not in properties["Interfaces"]:
 		continue
@@ -25,7 +25,7 @@
 		operators = netreg.GetOperators()
 
 	for path, properties in operators:
-		print "    [ %s ]" % (path)
+		print("    [ %s ]" % (path))
 
 		for key in properties.keys():
 			if key in ["Technologies"]:
@@ -34,6 +34,6 @@
 					val += i + " "
 			else:
 				val = str(properties[key])
-			print "        %s = %s" % (key, val)
+			print("        %s = %s" % (key, val))
 
-		print
+		print()

=== modified file 'test/lock-pin'
--- test/lock-pin	2010-09-09 19:38:14 +0000
+++ test/lock-pin	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -17,10 +17,10 @@
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
-	print "%s [PATH] pin_type pin" % (sys.argv[0])
+	print("%s [PATH] pin_type pin" % (sys.argv[0]))
 	sys.exit(0)
 
-print "Lock %s %s for modem %s..." % (pin_type, pin, path)
+print("Lock %s %s for modem %s..." % (pin_type, pin, path))
 
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')

=== modified file 'test/lockdown-modem'
--- test/lockdown-modem	2010-12-22 19:37:38 +0000
+++ test/lockdown-modem	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,13 +13,13 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Locking and disconnecting modem %s..." % path
+print("Locking and disconnecting modem %s..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.Modem')
 
 modem.SetProperty("Lockdown", dbus.Boolean(1))
 
-print "press ENTER to unlock the modem %s" % path
+print("press ENTER to unlock the modem %s" % path)
 sys.stdin.readline()
 
 modem.SetProperty("Lockdown", dbus.Boolean(0))

=== modified file 'test/monitor-dundee'
--- test/monitor-dundee	2012-05-22 16:44:46 +0000
+++ test/monitor-dundee	2014-02-28 20:44:46 +0000
@@ -1,12 +1,12 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 _dbus2py = {
-	dbus.String : unicode,
+	dbus.String : str,
 	dbus.UInt32 : int,
 	dbus.Int32 : int,
 	dbus.Int16 : int,
@@ -52,32 +52,32 @@
 
 def property_changed(name, value, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s = %s" % (iface, path, name, pretty(value))
+	print("{%s} [%s] %s = %s" % (iface, path, name, pretty(value)))
 
 def added(name, value, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s" % (iface, member, name, pretty(value))
+	print("{%s} [%s] %s %s" % (iface, member, name, pretty(value)))
 
 def removed(name, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s" % (iface, member, name)
+	print("{%s} [%s] %s" % (iface, member, name))
 
 def event(member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s" % (iface, path, member)
+	print("{%s} [%s] %s" % (iface, path, member))
 
 def message(msg, args, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s (%s)" % (iface, path, member,
-					str(msg), pretty(args))
+	print("{%s} [%s] %s %s (%s)" % (iface, path, member,
+					str(msg), pretty(args)))
 
 def ussd(msg, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s" % (iface, path, member, str(msg))
+	print("{%s} [%s] %s %s" % (iface, path, member, str(msg)))
 
 def value(value, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s" % (iface, path, member, str(value))
+	print("{%s} [%s] %s %s" % (iface, path, member, str(value)))
 
 if __name__ == '__main__':
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -105,5 +105,5 @@
 						interface_keyword="interface")
 
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/monitor-ofono'
--- test/monitor-ofono	2013-12-04 20:19:31 +0000
+++ test/monitor-ofono	2014-02-28 20:44:46 +0000
@@ -1,12 +1,12 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 _dbus2py = {
-	dbus.String : unicode,
+	dbus.String : str,
 	dbus.UInt32 : int,
 	dbus.Int32 : int,
 	dbus.Int16 : int,
@@ -55,24 +55,24 @@
 
 def property_changed(name, value, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s = %s" % (iface, path, name, pretty(value))
+	print("{%s} [%s] %s = %s" % (iface, path, name, pretty(value)))
 
 def added(name, value, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s" % (iface, member, name, pretty(value))
+	print("{%s} [%s] %s %s" % (iface, member, name, pretty(value)))
 
 def removed(name, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s" % (iface, name, member)
+	print("{%s} [%s] %s" % (iface, name, member))
 
 def event(member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s" % (iface, path, member)
+	print("{%s} [%s] %s" % (iface, path, member))
 
 def message(msg, args, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s (%s)" % (iface, path, member,
-					msg, pretty(args))
+	print("{%s} [%s] %s %s (%s)" % (iface, path, member,
+					msg, pretty(args)))
 
 def network_time_changed(time, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
@@ -80,11 +80,11 @@
 
 def ussd(msg, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s" % (iface, path, member, msg)
+	print("{%s} [%s] %s %s" % (iface, path, member, msg))
 
 def value(value, member, path, interface):
 	iface = interface[interface.rfind(".") + 1:]
-	print "{%s} [%s] %s %s" % (iface, path, member, str(value))
+	print("{%s} [%s] %s %s" % (iface, path, member, str(value)))
 
 if __name__ == '__main__':
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -162,5 +162,5 @@
 					path_keyword="path",
 					interface_keyword="interface")
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/offline-modem'
--- test/offline-modem	2011-08-07 14:36:34 +0000
+++ test/offline-modem	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus, sys
 
@@ -12,6 +12,6 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Setting modem %s offline..." % path
+print("Setting modem %s offline..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')
 modem.SetProperty("Online", dbus.Boolean(0), timeout = 120)

=== modified file 'test/online-modem'
--- test/online-modem	2011-08-07 14:36:34 +0000
+++ test/online-modem	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus, sys
 
@@ -12,6 +12,6 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Setting modem %s online..." % path
+print("Setting modem %s online..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')
 modem.SetProperty("Online", dbus.Boolean(1), timeout = 120)

=== modified file 'test/private-chat'
--- test/private-chat	2012-05-22 01:53:18 +0000
+++ test/private-chat	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -17,4 +17,4 @@
 mpty = manager.PrivateChat(sys.argv[1], timeout=100)
 
 for path in mpty:
-	print path
+	print(path)

=== modified file 'test/process-context-settings'
--- test/process-context-settings	2010-10-26 15:20:47 +0000
+++ test/process-context-settings	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import dbus
@@ -23,7 +23,7 @@
 		if properties["Active"] == dbus.Boolean(0):
 			continue
 
-		print "Configuring %s" % (path)
+		print("Configuring %s" % (path))
 
 		settings = properties["Settings"]
 
@@ -35,20 +35,20 @@
 			gateway = "0.0.0.0";
 
 		if settings["Method"] == "dhcp":
-			print "    Run DHCP on interface %s" % (interface)
+			print("    Run DHCP on interface %s" % (interface))
 		else:
-			print "    Interface is %s" % (interface)
-			print "    IP address is %s" % (address)
-			print "    Gateway is %s" % (gateway)
+			print("    Interface is %s" % (interface))
+			print("    IP address is %s" % (address))
+			print("    Gateway is %s" % (gateway))
 
 			cmd = "ifconfig " + interface + " " + address
 			cmd += " netmask 255.255.255.255"
 			os.system(cmd);
 
 			for i in settings["DomainNameServers"]:
-				print "    Nameserver is %s" % (i)
+				print("    Nameserver is %s" % (i))
 
 				cmd = "route add -host " + i
 				cmd +=" dev " + interface
 				os.system(cmd);
-		print
+		print()

=== modified file 'test/receive-sms'
--- test/receive-sms	2009-09-25 21:04:43 +0000
+++ test/receive-sms	2014-02-28 20:44:46 +0000
@@ -1,16 +1,16 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def incoming_message(message, details, path, interface):
-	print "%s" % (message)
+	print("%s" % (message))
 
 	for key in details:
 		val = details[key]
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
 if __name__ == '__main__':
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -29,5 +29,5 @@
 						path_keyword="path",
 						interface_keyword="interface")
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/reject-calls'
--- test/reject-calls	2012-01-02 02:25:00 +0000
+++ test/reject-calls	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,7 +22,7 @@
 
 	for path, properties in calls:
 		state = properties["State"]
-		print "[ %s ] %s" % (path, state)
+		print("[ %s ] %s" % (path, state))
 
 		if state != "incoming":
 			continue

=== modified file 'test/release-and-answer'
--- test/release-and-answer	2012-04-23 20:18:41 +0000
+++ test/release-and-answer	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue

=== modified file 'test/release-and-swap'
--- test/release-and-swap	2012-08-06 04:34:52 +0000
+++ test/release-and-swap	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue

=== modified file 'test/remove-contexts'
--- test/remove-contexts	2010-09-09 19:38:14 +0000
+++ test/remove-contexts	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -20,4 +20,4 @@
 
 	for path, properties in contexts:
 		connman.RemoveContext(path)
-		print"Removed: [ %s ]" % (path)
+		print("Removed: [ %s ]" % (path))

=== modified file 'test/reset-pin'
--- test/reset-pin	2010-11-09 15:30:06 +0000
+++ test/reset-pin	2014-02-28 20:44:46 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -14,9 +14,9 @@
 	path = modems[0][0]
 	puk_type, puk, pin = sys.argv[1:]
 else:
-	print "%s [PATH] puk_type puk pin" % (sys.argv[0])
+	print("%s [PATH] puk_type puk pin" % (sys.argv[0]))
 
-print "Reset pin for modem %s..." % path
+print("Reset pin for modem %s..." % path)
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')
 

=== added directory 'test/rilmodem'
=== added file 'test/rilmodem/test-hangup'
--- test/rilmodem/test-hangup	1970-01-01 00:00:00 +0000
+++ test/rilmodem/test-hangup	2014-02-28 20:44:46 +0000
@@ -0,0 +1,97 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+#
+# *** REQUIRED SETUP ***
+#
+# 1. /etc/host:
+# This script uses telnetlib to access the emulator console.  In
+# order for this to work, the emulator needs to be configured so
+# that it can access 'localhost' on the host machine.  This is 
+# done by modifying /etc/hosts in the emulator to define 'localhost'
+# as 10.0.2.2, which is a special alias to the host loopback interface.
+# Without this change, it's impossible for this script to access the
+# emulator console.
+#
+# 2. Modem online
+# This script must be run *after* the modem has been brought online,
+# otherwise it will fail.  This is currently done by telepathy-ofono,
+# which isn't being started in the current touch emulator, however it
+# will soon be the responsibility of urfkill.
+#
+#  *** TODO ***
+#
+# 1. This test calls HangupAll() which is an asynchronous operation.
+# There's no getting around that fact that a timer needs to be used
+# to delay querying the calls after the hangup.  The code currently
+# uses a time.sleep(5), however it could be changed to listen for a
+# CallRemoved signal.  A timer would still be required to catch the
+# scenario where the signal was never received.
+
+import dbus
+import sys
+import time
+import telnetlib
+
+def create_incoming_call(number, port):
+
+	tn = telnetlib.Telnet("localhost", 5554)
+	tn.read_until("OK")
+
+	tn.write("gsm call " + number + "\n")
+	print("incoming call created")
+
+	tn.read_until("OK")
+	tn.write("exit")
+
+if __name__ == "__main__":
+
+	if len(sys.argv) == 2:
+		port = sys.argv[1]
+	else:
+		port = 5554
+
+	create_incoming_call("6663334444", port)
+
+	bus = dbus.SystemBus()
+
+	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+				'org.ofono.Manager')
+	modems = manager.GetModems()
+
+	for path, properties in modems:
+		print("[ %s ]" % (path))
+
+		assert "org.ofono.VoiceCallManager" in properties["Interfaces"]
+
+		mgr = dbus.Interface(bus.get_object('org.ofono', path),
+				'org.ofono.VoiceCallManager')
+		calls = mgr.GetCalls()
+
+		assert len(calls) > 0, "No incoming call present!"
+
+		mgr.HangupAll()
+
+		time.sleep(5)
+
+		calls = mgr.GetCalls()
+
+		assert len(calls) == 0, "HangupAll() failed, calls still exist!"

=== added file 'test/rilmodem/test-modem-offline'
--- test/rilmodem/test-modem-offline	1970-01-01 00:00:00 +0000
+++ test/rilmodem/test-modem-offline	2014-02-28 20:44:46 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is offline.
+
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+modems = manager.GetModems()
+
+for path, properties in modems:
+	print("[ %s ]" % (path))
+
+	keys = list(properties.keys())
+
+	assert keys.index('Online') != "ValueError"
+	assert keys.index("Powered") != "ValueError"
+	assert keys.index("Emergency") != "ValueError"
+	assert keys.index("Lockdown") != "ValueError"
+	assert keys.index("Serial") != "ValueError"
+	assert keys.index("Revision") != "ValueError"
+	assert keys.index("Interfaces") != "ValueError"
+
+	assert properties['Online'] == 0
+	assert properties['Powered'] == 1
+	assert properties['Emergency'] == 0
+	assert properties["Lockdown"] == 0
+	assert properties["Serial"].isalnum()
+	assert properties["Revision"].isalnum() 
+
+	print("OK\n")

=== added file 'test/rilmodem/test-sim-online'
--- test/rilmodem/test-sim-online	1970-01-01 00:00:00 +0000
+++ test/rilmodem/test-sim-online	2014-02-28 20:44:46 +0000
@@ -0,0 +1,266 @@
+#!/usr/bin/python3
+#
+#  oFono - Open Source Telephony - RIL Modem test
+#
+#  Copyright (C) 2014 Canonical Ltd.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2 as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# This test ensures that basic modem information is available
+# when the modem is online and has a valid, unlocked SIM present.
+
+import argparse
+import dbus
+import time
+
+def is_modem_online(properties):
+	"""Returns the modem 'Online' property.
+	"""
+	return properties['Online']
+
+def set_modem_online(modem, path):
+	"""Sets the modem 'Online' property.
+	"""
+
+	print("Setting modem %s online..." % path)
+
+	modem.SetProperty("Online", dbus.Boolean(1), timeout = 120)
+
+def validate_emergency_numbers():
+	# valid VoiceCallManager properties
+	voice = dbus.Interface(bus.get_object('org.ofono', path),
+			'org.ofono.VoiceCallManager')
+
+	properties = voice.GetProperties()
+	keys = list(properties.keys())
+
+	assert keys.index("EmergencyNumbers") != "ValueError"
+
+	numbers = properties["EmergencyNumbers"]
+
+	print("%s" % numbers)
+
+	for number in numbers:
+		assert number in ["08", "000", "999", "110", "112", "911", "118", "119"]
+
+	print("OK\n")
+
+def validate_netreg(args, path):
+	"""Validates NetworkRegistration properties.
+	"""
+
+	# valid NetworkRegistration properties
+	netreg = dbus.Interface(bus.get_object('org.ofono', path),
+				'org.ofono.NetworkRegistration')
+
+	properties = netreg.GetProperties()
+	keys = list(properties.keys())
+
+	assert keys.index("Status") != "ValueError"
+
+	# TODO: no Strength reported by emulator!
+	# assert keys.index("Strength") != "ValueError"
+
+	assert keys.index("Name") != "ValueError"
+	assert keys.index("LocationAreaCode") != "ValueError"
+	assert keys.index("Mode") != "ValueError"
+	assert keys.index("MobileCountryCode") != "ValueError"
+
+	# TODO: no Technology reported by emulator
+	# assert keys.index("Technology") != "ValueError"
+
+	assert keys.index("CellId") != "ValueError"
+	assert keys.index("MobileNetworkCode") != "ValueError"
+
+	assert properties["Status"] == "registered"
+	assert properties["Name"] == "Android (Android)"
+	assert properties["LocationAreaCode"] == 65535
+
+	# TODO: emulator reports "Mode" as "auto" ! "auto-only"
+	# assert properties["Mode"] == "auto-only"
+
+	assert properties["MobileCountryCode"] == "310"
+    
+	# TODO: no Technology reported by emulator
+	# assert properties["Technology"] == "umts"
+
+	assert properties["MobileNetworkCode"] == "260"
+
+
+def parse_arguments():
+	"""Parses command-line arguments.
+	"""
+
+	parser = argparse.ArgumentParser(description="test-sim-online script")
+
+	parser.add_argument("-e",
+			"--emulator",
+			dest="emulator",
+			action="store_true",
+			help="""Indicates that this script is to
+			run in the Touch emulator""",
+			default=False
+			)
+	parser.add_argument("-o",
+			"--online",
+			dest="online",
+			action="store_true",
+			help="""Set the modem online if required""",
+			default=False,
+			)
+	parser.add_argument("--mnc",
+			dest="mnc",
+			help="""Specify a MNC (mobile-network-code) to
+			match against""",
+			default="",
+			)
+	parser.add_argument("--mcc",
+			dest="mcc",
+			help="""Specify a MCC (mobile-country-code) to
+			match against""",
+			default="",
+			)
+	parser.add_argument("--subscriber",
+			dest="subscriber",
+			help="""Specify a SubscriberIdentity to
+			match against""",
+			default="",
+			)
+	parser.add_argument("--netreg",
+			dest="netreg",
+			action="store_true",
+			help="""Validate Netreg interface""",
+			default=False,
+			)
+
+	return parser.parse_args()
+
+def main(args):
+
+	bus = dbus.SystemBus()
+
+	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+				'org.ofono.Manager')
+	modems = manager.GetModems()
+	path = modems[0][0]
+	modem = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Modem')
+	properties = modem.GetProperties()
+
+	print("[ %s ]" % path)
+
+	if is_modem_online(properties) == 0 and args.online == True:
+		set_modem_online(modem, path)
+		time.sleep(5)
+
+	keys = list(properties.keys())
+
+	assert keys.index("Features") != "ValueError"
+	assert keys.index("Emergency") != "ValueError"
+	assert keys.index("Powered") != "ValueError"
+	assert keys.index("Lockdown") != "ValueError"
+	assert keys.index("Interfaces") != "ValueError"
+	assert keys.index("Online") != "ValueError"
+	assert keys.index("Model") != "ValueError"
+
+	# TODO: not properly set by emulator
+	if args.emulator == False:
+		assert keys.index("Revision") != "ValueError"
+
+	assert keys.index("Type") != "ValueError"
+    
+	# TODO: not properly set by emulator
+	if args.emulator == False:
+		assert keys.index("Serial") != "ValueError"
+
+	assert keys.index("Manufacturer") != "ValueError"
+
+	# validate Features = net sms gprs sim
+
+	assert properties["Emergency"] == 0
+	assert properties["Powered"] == 1
+	assert properties["Lockdown"] == 0
+
+	# TODO: validate Interfaces: NetworkReg, CallVolume, MessageManager,
+	#       ConnectionManager, NetworkTime, SimManager, VoiceCallManager
+
+	assert properties["Online"] == 1
+	assert properties["Model"] == "Fake Modem Model"
+	assert properties["Type"] == "hardware"
+
+	# TODO: not properly set by emulator
+	# assert properties["Serial"] == "000000000000000"
+
+	assert properties["Manufacturer"] == "Fake Manufacturer"
+
+	# valid SimManager properties
+	simmanager = dbus.Interface(bus.get_object('org.ofono', path),
+				'org.ofono.SimManager')
+
+	properties = simmanager.GetProperties()
+	keys = list(properties.keys())
+
+	assert keys.index("Retries") != "ValueError"
+	assert keys.index("FixedDialing") != "ValueError"
+	assert keys.index("MobileCountryCode") != "ValueError"
+	assert keys.index("SubscriberNumbers") != "ValueError"
+	assert keys.index("BarredDialing") != "ValueError"
+	assert keys.index("CardIdentifier") != "ValueError"
+	assert keys.index("LockedPins") != "ValueError"
+	assert keys.index("MobileNetworkCode") != "ValueError"
+	assert keys.index("SubscriberIdentity") != "ValueError"
+	assert keys.index("Present") != "ValueError"
+	assert keys.index("PinRequired") != "ValueError"
+
+	# TODO: Retries isn't currently populated ( lp: )
+	# assert properties["Retries"] ==
+
+	assert properties["FixedDialing"] == 0
+
+	# TODO: make these optional arguments
+	if args.emulator:
+		assert properties["MobileCountryCode"] == "310"
+	elif args.mcc != "":
+		assert properties["MobileCountryCode"] == args.mcc
+
+	if args.emulator:
+		assert properties["SubscriberNumbers"][0] == "15555215554"
+
+	assert properties["BarredDialing"] == 0
+
+	if args.emulator:
+		assert properties["CardIdentifier"] == "89014103211118510720"
+
+	assert len(properties["LockedPins"]) == 0
+
+	if args.emulator:
+		assert properties["MobileNetworkCode"] == "260"
+	elif args.mnc != "":
+		assert properties["MobileNetworkCode"] == args.mnc
+
+	if args.emulator:
+		assert properties["SubscriberIdentity"] == "310260000000000"
+	elif args.subscriber != "":
+		assert properties["SubscriberIdentity"] == args.subscriber
+
+	assert properties["Present"] == 1
+	assert properties["PinRequired"] == "none"
+
+	if args.netreg:
+		validate_netreg(args, path)
+
+	# TODO: add support for emergency numbers
+
+if __name__ == "__main__":
+	args = parse_arguments()
+	main(args)

=== modified file 'test/scan-for-operators'
--- test/scan-for-operators	2010-12-03 12:46:51 +0000
+++ test/scan-for-operators	2014-02-28 20:44:46 +0000
@@ -13,7 +13,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Scanning operators on modem %s..." % path
+print("Scanning operators on modem %s..." % path)
 netreg = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.NetworkRegistration')
 
@@ -23,7 +23,7 @@
 	path = entry[0]
 	properties = entry[1]
 
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	for key in properties.keys():
 		if key in ["Technologies"]:
@@ -32,7 +32,7 @@
 				val += i + " "
 		else:
 			val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
-	print
+	print()
 

=== modified file 'test/send-sms'
--- test/send-sms	2012-06-25 07:04:38 +0000
+++ test/send-sms	2014-02-28 20:44:46 +0000
@@ -4,8 +4,8 @@
 import dbus
 
 if len(sys.argv) < 4:
-	print "Usage: %s [modem] <to> <message> <delivery report>" %\
-					(sys.argv[0])
+	print("Usage: %s [modem] <to> <message> <delivery report>" %\
+					(sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -18,7 +18,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Send message using modem %s ..." % path
+print("Send message using modem %s ..." % path)
 
 
 mm = dbus.Interface(bus.get_object('org.ofono', path),
@@ -31,4 +31,4 @@
 	mm.SetProperty("UseDeliveryReports", dbus.Boolean(int(sys.argv[3])))
 	path = mm.SendMessage(sys.argv[1], sys.argv[2])
 
-print path
+print(path)

=== modified file 'test/send-ussd'
--- test/send-ussd	2012-07-27 05:30:57 +0000
+++ test/send-ussd	2014-02-28 20:44:46 +0000
@@ -4,7 +4,7 @@
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s [modem] <ussd-string>" % (sys.argv[0])
+	print("Usage: %s [modem] <ussd-string>" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -27,13 +27,13 @@
 properties = ussd.GetProperties()
 state = properties["State"]
 
-print "State: %s" % (state)
+print("State: %s" % (state))
 
 if state == "idle":
 	result = ussd.Initiate(ussdstring, timeout=100)
-	print result[0] + ": " + result[1]
+	print(result[0] + ": " + result[1])
 elif state == "user-response":
-	print ussd.Respond(ussdstring, timeout=100)
+	print(ussd.Respond(ussdstring, timeout=100))
 else:
 	sys.exit(1);
 
@@ -43,15 +43,15 @@
 if state == "idle":
 	sys.exit(0)
 
-print "State: %s" % (state)
+print("State: %s" % (state))
 
 while state == "user-response":
-	response = raw_input("Enter response: ")
+	response = input("Enter response: ")
 
-	print ussd.Respond(response, timeout=100)
+	print(ussd.Respond(response, timeout=100))
 
 	properties = ussd.GetProperties()
 	state = properties["State"]
 
 	if state != "idle":
-		print "State: %s" % (state)
+		print("State: %s" % (state))

=== modified file 'test/send-vcal'
--- test/send-vcal	2011-04-28 14:20:11 +0000
+++ test/send-vcal	2014-02-28 20:44:46 +0000
@@ -4,7 +4,7 @@
 import dbus
 
 if len(sys.argv) < 3:
-	print "Usage: %s [modem] <to> <vcal file>" % (sys.argv[0])
+	print("Usage: %s [modem] <to> <vcal file>" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -17,7 +17,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Send vcal using modem %s ..." % path
+print("Send vcal using modem %s ..." % path)
 
 sm = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.SmartMessaging')
@@ -29,4 +29,4 @@
 	vcal = file(sys.argv[2]).read()
 	path = sm.SendAppointment(sys.argv[1], vcal)
 
-print path
+print(path)

=== modified file 'test/send-vcard'
--- test/send-vcard	2011-04-28 14:20:11 +0000
+++ test/send-vcard	2014-02-28 20:44:46 +0000
@@ -4,7 +4,7 @@
 import dbus
 
 if len(sys.argv) < 3:
-	print "Usage: %s [modem] <to> <vcard file>" % (sys.argv[0])
+	print("Usage: %s [modem] <to> <vcard file>" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -17,7 +17,7 @@
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Send vcard using modem %s ..." % path
+print("Send vcard using modem %s ..." % path)
 
 sm = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.SmartMessaging')
@@ -29,4 +29,4 @@
 	vcard = file(sys.argv[2]).read()
 	path = sm.SendBusinessCard(sys.argv[1], vcard)
 
-print path
+print(path)

=== modified file 'test/set-call-forwarding'
--- test/set-call-forwarding	2011-02-01 17:36:01 +0000
+++ test/set-call-forwarding	2014-02-28 20:44:46 +0000
@@ -1,26 +1,26 @@
 #!/usr/bin/python
 
 import sys
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
 	if len(value.__str__()) > 0:
-		print "CF property %s changed to %s" % (property, value)
+		print("CF property %s changed to %s" % (property, value))
 	else:
-		print "CF property %s changed to disabled" % (property)
+		print("CF property %s changed to disabled" % (property))
 
 	if canexit:
 		mainloop.quit();
 
 if __name__ == "__main__":
 	if len(sys.argv) < 3:
-		print "Usage: %s <property> <value>" % (sys.argv[0])
-		print "Properties can be: VoiceUnconditional, VoiceBusy,"
-		print "	VoiceNoReply, VoiceNoReplyTimeout, VoiceNotReachable"
-		print "Value: number to or the timeout"
+		print("Usage: %s <property> <value>" % (sys.argv[0]))
+		print("Properties can be: VoiceUnconditional, VoiceBusy,")
+		print("	VoiceNoReply, VoiceNoReplyTimeout, VoiceNotReachable")
+		print("Value: number to or the timeout")
 		sys.exit(1)
 
 	property = sys.argv[1]
@@ -46,19 +46,19 @@
 		try:
 			cf.SetProperty(property, dbus.UInt16(value),
 							timeout = 100)
-		except dbus.DBusException, e:
-			print "Unable SetProperty", e
+		except dbus.DBusException as e:
+			print("Unable SetProperty %s" % e)
 			sys.exit(1);
 	else:
 		try:
 			cf.SetProperty(property, value, timeout = 100)
-		except dbus.DBusException, e:
-			print "Unable SetProperty", e
+		except dbus.DBusException as e:
+			print("Unable SetProperty %s" % e)
 			sys.exit(1);
 
-	print "Set Property successful"
+	print("Set Property successful")
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/set-cbs-topics'
--- test/set-cbs-topics	2010-09-09 19:38:14 +0000
+++ test/set-cbs-topics	2014-02-28 20:44:46 +0000
@@ -15,9 +15,9 @@
 	path = modems[0][0]
 	topics = sys.argv[1]
 else:
-	print "%s [PATH] topics" % (sys.argv[0])
+	print("%s [PATH] topics" % (sys.argv[0]))
 
-print "Setting cell broadcast topics for modem %s..." % path
+print("Setting cell broadcast topics for modem %s..." % path)
 cbs = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.CellBroadcast')
 

=== modified file 'test/set-context-property'
--- test/set-context-property	2011-03-24 18:24:38 +0000
+++ test/set-context-property	2014-02-28 20:44:46 +0000
@@ -4,7 +4,7 @@
 import dbus
 
 if len(sys.argv) < 4:
-	print "Usage: set-context-property <context> <name> <value>"
+	print("Usage: set-context-property <context> <name> <value>")
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -24,7 +24,7 @@
 	contexts = connman.GetContexts()
 
 	if (len(contexts) == 0):
-		print "No context available"
+		print("No context available")
 		sys.exit(1)
 
 	path = contexts[int(sys.argv[1])][0]
@@ -33,7 +33,7 @@
 
 	try:
 		context.SetProperty(sys.argv[2], sys.argv[3])
-	except dbus.DBusException, e:
-		print "Error setting context %s property %s: %s" %\
-				(path, sys.argv[2], str(e))
+	except dbus.DBusException as e:
+		print("Error setting context %s property %s: %s" %\
+				(path, sys.argv[2], str(e)))
 		exit(2)

=== modified file 'test/set-fast-dormancy'
--- test/set-fast-dormancy	2010-10-28 03:26:15 +0000
+++ test/set-fast-dormancy	2014-02-28 20:44:46 +0000
@@ -15,10 +15,10 @@
 	path = modems[0][0]
 	enable = int(sys.argv[1])
 else:
-	print "%s [PATH] {0|1}" % (sys.argv[0])
+	print("%s [PATH] {0|1}" % (sys.argv[0]))
 	exit(1)
 
-print "Setting fast dormancy for modem %s..." % path
+print("Setting fast dormancy for modem %s..." % path)
 radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.RadioSettings')
 

=== modified file 'test/set-gsm-band'
--- test/set-gsm-band	2010-12-21 22:02:49 +0000
+++ test/set-gsm-band	2014-02-28 20:44:46 +0000
@@ -15,10 +15,10 @@
 	path = modems[0][0]
 	band = sys.argv[1]
 else:
-	print "%s [PATH] band" % (sys.argv[0])
+	print("%s [PATH] band" % (sys.argv[0]))
 	exit(1)
 
-print "Setting gsm band for modem %s..." % path
+print("Setting gsm band for modem %s..." % path)
 radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.RadioSettings')
 

=== modified file 'test/set-mms-details'
--- test/set-mms-details	2010-10-26 20:35:43 +0000
+++ test/set-mms-details	2014-02-28 20:44:46 +0000
@@ -26,18 +26,18 @@
 			break
 
 	if path == "":
-		print "No MMS context"
+		print("No MMS context")
 		exit(1)
 
 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')
 
 	if len(sys.argv) < 3:
-		print "Usage: %s <proxy> <center>" % (sys.argv[0])
+		print("Usage: %s <proxy> <center>" % (sys.argv[0]))
 		exit(1)
 
 	context.SetProperty("MessageProxy", sys.argv[1])
-	print "Setting MMS Proxy to %s" % (sys.argv[1])
+	print("Setting MMS Proxy to %s" % (sys.argv[1]))
 
 	context.SetProperty("MessageCenter", sys.argv[2])
-	print "Setting MMSC to %s" % (sys.argv[2])
+	print("Setting MMSC to %s" % (sys.argv[2]))

=== modified file 'test/set-roaming-allowed'
--- test/set-roaming-allowed	2010-10-05 14:11:09 +0000
+++ test/set-roaming-allowed	2014-02-28 20:44:46 +0000
@@ -24,4 +24,4 @@
 
 	connman.SetProperty("RoamingAllowed", allowed)
 
-	print "Setting %s to RoamingAllowed=%d" % (path, allowed)
+	print("Setting %s to RoamingAllowed=%d" % (path, allowed))

=== modified file 'test/set-tech-preference'
--- test/set-tech-preference	2010-09-09 19:38:14 +0000
+++ test/set-tech-preference	2014-02-28 20:44:46 +0000
@@ -15,9 +15,9 @@
 	path = modems[0][0]
 	tech = sys.argv[1]
 else:
-	print "%s [PATH] technology" % (sys.argv[0])
+	print("%s [PATH] technology" % (sys.argv[0]))
 
-print "Setting technology preference for modem %s..." % path
+print("Setting technology preference for modem %s..." % path)
 radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.RadioSettings')
 

=== modified file 'test/set-tty'
--- test/set-tty	2010-11-26 19:21:50 +0000
+++ test/set-tty	2014-02-28 20:44:46 +0000
@@ -15,10 +15,10 @@
 	path = modems[0][0]
 	enable = int(sys.argv[1])
 else:
-	print "%s [PATH] {0|1}" % (sys.argv[0])
+	print("%s [PATH] {0|1}" % (sys.argv[0]))
 	exit(1)
 
-print "Setting TTY for modem %s..." % path
+print("Setting TTY for modem %s..." % path)
 texttelephony = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.TextTelephony')
 

=== modified file 'test/set-umts-band'
--- test/set-umts-band	2010-12-21 22:02:49 +0000
+++ test/set-umts-band	2014-02-28 20:44:46 +0000
@@ -15,10 +15,10 @@
 	path = modems[0][0]
 	band = sys.argv[1]
 else:
-	print "%s [PATH] band" % (sys.argv[0])
+	print("%s [PATH] band" % (sys.argv[0]))
 	exit(1)
 
-print "Setting umts band for modem %s..." % path
+print("Setting umts band for modem %s..." % path)
 radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.RadioSettings')
 

=== modified file 'test/set-use-sms-reports'
--- test/set-use-sms-reports	2011-01-29 17:51:24 +0000
+++ test/set-use-sms-reports	2014-02-28 20:44:46 +0000
@@ -19,10 +19,10 @@
 	if sys.argv[1] == "off":
 		enabled = 0
 else:
-	print "%s [PATH] on/off" % (sys.argv[0])
+	print("%s [PATH] on/off" % (sys.argv[0]))
 	sys.exit(1)
 
-print "Setting delivery report use for modem %s..." % path
+print("Setting delivery report use for modem %s..." % path)
 sms = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.MessageManager')
 

=== modified file 'test/test-advice-of-charge'
--- test/test-advice-of-charge	2011-02-16 15:09:46 +0000
+++ test/test-advice-of-charge	2014-02-28 20:44:46 +0000
@@ -1,22 +1,22 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 import sys
 import dbus
 import dbus.mainloop.glib
 
 
 def cm_property_changed(name, value):
-	print "CallMeter property: '%s' changed to '%s'" % (name, str(value))
+	print("CallMeter property: '%s' changed to '%s'" % (name, str(value)))
 	if canexit:
 		mainloop.quit()
 
 def cm_maximum_reached():
-	print "Only 30 seconds call time remains, recharge."
+	print("Only 30 seconds call time remains, recharge.")
 
 def print_useage(s):
-	print "Usage: %s <property> <newvalue> <password>" % (s)
-	print "Usage: %s reset <password>" % (s)
+	print("Usage: %s <property> <newvalue> <password>" % (s))
+	print("Usage: %s reset <password>" % (s))
 	sys.exit(1);
 
 if __name__ == "__main__":
@@ -51,24 +51,24 @@
 
 	properties = cm.GetProperties()
 
-	print "Currency: %s" % (properties['Currency'])
-	print "PricePerUnit %s" % (properties['PricePerUnit'])
-	print "Call meter for the current call: %s" % (properties['CallMeter'])
-	print "Call meter for current and previous calls: %s" %\
-		properties['AccumulatedCallMeter']
-	print "Call meter maximum, once reached calls are not possible: %s" %\
-		properties['AccumulatedCallMeterMaximum']
+	print("Currency: %s" % (properties['Currency']))
+	print("PricePerUnit %s" % (properties['PricePerUnit']))
+	print("Call meter for the current call: %s" % (properties['CallMeter']))
+	print("Call meter for current and previous calls: %s" %\
+		properties['AccumulatedCallMeter'])
+	print("Call meter maximum, once reached calls are not possible: %s" %\
+		properties['AccumulatedCallMeterMaximum'])
 
 	total = properties['PricePerUnit'] * properties['AccumulatedCallMeter']
-	print "Accumulated Meter in Currency: %s %s" %\
-		(total, properties['Currency'])
+	print("Accumulated Meter in Currency: %s %s" %\
+		(total, properties['Currency']))
 
 	if (sys.argv[1] == 'reset'):
-		print "Resetting Accumulated Call Meter"
+		print("Resetting Accumulated Call Meter")
 		try:
 			cm.Reset(pin)
-		except dbus.DBusException, e:
-			print "Unable to reset ACM: ", e
+		except dbus.DBusException as e:
+			print("Unable to reset ACM: %s" % e)
 			sys.exit(1)
 	else:
 		try:
@@ -77,11 +77,11 @@
 			elif property == 'PricePerUnit':
 				newvalue = float(newvalue)
 			cm.SetProperty(property, newvalue, pin)
-		except dbus.DBusException, e:
-			print "Unable to set property: ", e
+		except dbus.DBusException as e:
+			print("Unable to set property: %s" % e)
 			sys.exit(1)
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-call-barring'
--- test/test-call-barring	2010-12-17 00:57:48 +0000
+++ test/test-call-barring	2014-02-28 20:44:46 +0000
@@ -1,20 +1,20 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 import sys
 import dbus
 import dbus.mainloop.glib
 
 
 def property_changed(name, value):
-	print "CallBarring property: '%s' changed to '%s'" % (name, str(value))
+	print("CallBarring property: '%s' changed to '%s'" % (name, str(value)))
 	if canexit:
 		mainloop.quit()
 
 def print_useage(s):
-	print "Usage: %s <property> <newvalue> <password>" % (s)
-	print "Usage: %s disableall <password>" % (s)
-	print "Usage: %s passwd <old_password> <new_password>" % (s)
+	print("Usage: %s <property> <newvalue> <password>" % (s))
+	print("Usage: %s disableall <password>" % (s))
+	print("Usage: %s passwd <old_password> <new_password>" % (s))
 	sys.exit(1);
 
 if __name__ == "__main__":
@@ -51,34 +51,34 @@
 
 	properties = cb.GetProperties()
 
-	print "Barring settings for Incoming Voice calls: %s" %\
-		(properties['VoiceIncoming'])
-	print "Barring settings for Outgoing Calls: %s" %\
-		(properties['VoiceOutgoing'])
+	print("Barring settings for Incoming Voice calls: %s" %\
+		(properties['VoiceIncoming']))
+	print("Barring settings for Outgoing Calls: %s" %\
+		(properties['VoiceOutgoing']))
 
 	if (sys.argv[1] == 'disableall'):
-		print "Disabling all barrings"
+		print("Disabling all barrings")
 		try:
 			cb.DisableAll(pin)
-		except dbus.DBusException, e:
-			print "Unable to Disable All barrings: ", e
+		except dbus.DBusException as e:
+			print("Unable to Disable All barrings: ", e)
 			sys.exit(1)
 	elif (sys.argv[1] == 'passwd'):
 		try:
 			cb.ChangePassword(old_password, new_password)
-		except dbus.DBusException, e:
-			print "Unable to change password: ", e
+		except dbus.DBusException as e:
+			print("Unable to change password: ", e)
 			sys.exit(1)
-		print "Password changed"
+		print("Password changed")
 		sys.exit(0)
 	else:
 		try:
 			cb.SetProperty(property, newvalue, pin)
-		except dbus.DBusException, e:
-			print "Unable to set property: ", e
+		except dbus.DBusException as e:
+			print("Unable to set property: ", e)
 			sys.exit(1)
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-call-forwarding'
--- test/test-call-forwarding	2010-09-09 19:38:14 +0000
+++ test/test-call-forwarding	2014-02-28 20:44:46 +0000
@@ -1,21 +1,21 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
-	print "CallForwarding property %s changed to %s" % (property, value)
+	print("CallForwarding property %s changed to %s" % (property, value))
 
 def print_properties(cf):
 	properties = cf.GetProperties()
 
 	for p in properties:
 		if len(properties[p].__str__()) > 0:
-			print "%s call forwarding rule is: %s" % (p, properties[p])
+			print("%s call forwarding rule is: %s" % (p, properties[p]))
 		else:
-			print "%s call forwarding rule disabled" % (p)
+			print("%s call forwarding rule disabled" % (p))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -36,84 +36,84 @@
 
 	try:
 		cf.SetProperty("FoobarNoReplyTimeout", dbus.UInt16(19))
-	except dbus.DBusException, e:
-		print "Unable to set timeout - Good"
+	except dbus.DBusException as e:
+		print("Unable to set timeout - Good")
 
 	try:
 		cf.SetProperty("VoiceNotReachableTimeout", dbus.UInt16(19))
-	except dbus.DBusException, e:
-		print "Unable to set timeout - Good"
+	except dbus.DBusException as e:
+		print("Unable to set timeout - Good")
 
 	try:
 		cf.SetProperty("VoiceNoReplyTimeout", dbus.UInt16(19))
-	except dbus.DBusException, e:
-		print "Unable to set timeout - Good"
+	except dbus.DBusException as e:
+		print("Unable to set timeout - Good")
 
 	try:
 		cf.SetProperty("DataNoReplyTimeout", dbus.UInt16(19))
-	except dbus.DBusException, e:
-		print "Unable to set timeout - Good"
+	except dbus.DBusException as e:
+		print("Unable to set timeout - Good")
 
 	try:
 		cf.SetProperty("FaxNoReplyTimeout", dbus.UInt16(19))
-	except dbus.DBusException, e:
-		print "Unable to set timeout - Good"
+	except dbus.DBusException as e:
+		print("Unable to set timeout - Good")
 
 	try:
 		cf.SetProperty("SmsNoReplyTimeout", dbus.UInt16(19))
-	except dbus.DBusException, e:
-		print "Unable to set timeout - Good"
+	except dbus.DBusException as e:
+		print("Unable to set timeout - Good")
 
 	try:
 		cf.SetProperty("VoiceNoReply", "")
-	except dbus.DBusException, e:
-		print "Unable to erase voice no reply rule - Bad"
+	except dbus.DBusException as e:
+		print("Unable to erase voice no reply rule - Bad")
 
 	try:
 		cf.SetProperty("VoiceNoReply", "+134444")
-	except dbus.DBusException, e:
-		print "Unable to register voice no reply rule - Bad"
+	except dbus.DBusException as e:
+		print("Unable to register voice no reply rule - Bad")
 
 	try:
 		cf.SetProperty("VoiceNoReplyTimeout", dbus.UInt16(30))
-	except dbus.DBusException, e:
-		print "Unable to set voice no reply timeout - Bad"
+	except dbus.DBusException as e:
+		print("Unable to set voice no reply timeout - Bad")
 
 	properties = cf.GetProperties()
 
-	print properties["VoiceNoReply"]
-	print properties["VoiceNoReplyTimeout"]
+	print(properties["VoiceNoReply"])
+	print(properties["VoiceNoReplyTimeout"])
 
 	try:
 		cf.SetProperty("VoiceUnconditional", "+155555")
-	except dbus.DBusException, e:
-		print "Unable to set Voice Unconditional - Bad"
+	except dbus.DBusException as e:
+		print("Unable to set Voice Unconditional - Bad")
 
 	properties = cf.GetProperties()
 
-	print properties["VoiceUnconditional"]
+	print(properties["VoiceUnconditional"])
 
 	try:
 		cf.DisableAll("foobar")
-	except dbus.DBusException, e:
-		print "Unable to delete invalids - Good"
+	except dbus.DBusException as e:
+		print("Unable to delete invalids - Good")
 
 	try:
 		cf.DisableAll("conditional")
-	except dbus.DBusException, e:
-		print "Unable to delete all conditional - Bad"
+	except dbus.DBusException as e:
+		print("Unable to delete all conditional - Bad")
 
 	properties = cf.GetProperties()
 
-	print properties["VoiceNoReply"]
-	print properties["VoiceNoReplyTimeout"]
+	print(properties["VoiceNoReply"])
+	print(properties["VoiceNoReplyTimeout"])
 
 	try:
 		cf.DisableAll("all")
-	except dbus.DBusException, e:
-		print "Unable to delete all conditional - Bad"
-
-	print properties["VoiceUnconditional"]
-
-	mainloop = gobject.MainLoop()
+	except dbus.DBusException as e:
+		print("Unable to delete all conditional - Bad")
+
+	print(properties["VoiceUnconditional"])
+
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-call-settings'
--- test/test-call-settings	2011-03-08 19:21:52 +0000
+++ test/test-call-settings	2014-02-28 20:44:46 +0000
@@ -1,24 +1,24 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 import sys
 
 def property_changed(name, value):
-	print "CallSettings property: '%s' changed to '%s'" % (name, value)
+	print("CallSettings property: '%s' changed to '%s'" % (name, value))
 
 	if canexit:
 		mainloop.quit();
 
 if __name__ == "__main__":
 	if len(sys.argv) < 3:
-		print "Usage: %s [modem] <property> <newvalue>" % (sys.argv[0])
-		print "Properties can be: VoiceCallWaiting,"
-		print "	ConnectedLineRestriction, CallingLineRestriction,"
-		print "	CallingLinePresentation, CalledLinePresentation,"
-		print "	ConnectedLinePresentation, HideCallerId"
+		print("Usage: %s [modem] <property> <newvalue>" % (sys.argv[0]))
+		print("Properties can be: VoiceCallWaiting,")
+		print("	ConnectedLineRestriction, CallingLineRestriction,")
+		print("	CallingLinePresentation, CalledLinePresentation,")
+		print("	ConnectedLinePresentation, HideCallerId")
 		sys.exit(1)
 
 	canexit = False
@@ -41,7 +41,7 @@
 		property = sys.argv[1]
 		newvalue = sys.argv[2]
 
-	print "Using modem %s" % modem
+	print("Using modem %s" % modem)
 
 	cs = dbus.Interface(bus.get_object('org.ofono', modem),
 						'org.ofono.CallSettings')
@@ -50,34 +50,34 @@
 
 	properties = cs.GetProperties()
 
-	print "Current Property values:"
-	print "Network Status of Call Waiting - Voice: %s" %\
-		(properties['VoiceCallWaiting'])
-	print "Network Status of Connected Line Restriction: %s" %\
-		(properties['ConnectedLineRestriction'])
-	print "Network Status of Calling Line Restriction: %s" %\
-		(properties['CallingLineRestriction'])
-	print "Network Status of Calling Line Presentation: %s" %\
-		(properties['CallingLinePresentation'])
-	print "Network Status of Called Line Presentation: %s" %\
-		(properties['CalledLinePresentation'])
-	print "Network Status of Connected Line Presentation: %s" %\
-		(properties['ConnectedLinePresentation'])
-	print "Hide my Caller Id: %s" % (properties['HideCallerId'])
+	print("Current Property values:")
+	print("Network Status of Call Waiting - Voice: %s" %\
+		(properties['VoiceCallWaiting']))
+	print("Network Status of Connected Line Restriction: %s" %\
+		(properties['ConnectedLineRestriction']))
+	print("Network Status of Calling Line Restriction: %s" %\
+		(properties['CallingLineRestriction']))
+	print("Network Status of Calling Line Presentation: %s" %\
+		(properties['CallingLinePresentation']))
+	print("Network Status of Called Line Presentation: %s" %\
+		(properties['CalledLinePresentation']))
+	print("Network Status of Connected Line Presentation: %s" %\
+		(properties['ConnectedLinePresentation']))
+	print("Hide my Caller Id: %s" % (properties['HideCallerId']))
 
 	try:
 		cs.SetProperty(property, newvalue)
-	except dbus.DBusException, e:
-		print "Unable to set property: ", e
+	except dbus.DBusException as e:
+		print("Unable to set property: %s" % e)
 		sys.exit(1);
 
-	print "Setting successful"
+	print("Setting successful")
 
 	if (properties[property] == newvalue):
-		print "Setting was already set to this value"
+		print("Setting was already set to this value")
 		sys.exit(1);
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-cbs'
--- test/test-cbs	2011-03-14 14:32:29 +0000
+++ test/test-cbs	2014-02-28 20:44:46 +0000
@@ -3,73 +3,73 @@
 import dbus
 import dbus.mainloop.glib
 import sys
-import gobject
+from gi.repository import GLib
 import os
 
 def print_menu():
-	print "Select test case"
-	print "----------------------------------------------------------------"
-	print "[0] Activate cbs"
-	print "[1] Deactivate cbs"
-	print "[2] Get cbs properties"
-	print "[3] Set/Register topics"
-	print "        If several - give topics separated with comma. \
-		\n        E.g. 20,50-51,60"
-	print "[4] Clear/Unregister topics"
-	print "[5] NetReg Base Station - Get current serving cell"
-	print "[x] Exit"
-	print "----------------------------------------------------------------"
+	print("Select test case")
+	print("----------------------------------------------------------------")
+	print("[0] Activate cbs")
+	print("[1] Deactivate cbs")
+	print("[2] Get cbs properties")
+	print("[3] Set/Register topics")
+	print("        If several - give topics separated with comma. \
+		\n        E.g. 20,50-51,60")
+	print("[4] Clear/Unregister topics")
+	print("[5] NetReg Base Station - Get current serving cell")
+	print("[x] Exit")
+	print("----------------------------------------------------------------")
 
 def property_changed(property, value):
 	if value == "" and property == "Topics":
-		print "User selected Topics have been cleared. \
-			\nRegistered for emergency topics only."
+		print("User selected Topics have been cleared. \
+			\nRegistered for emergency topics only.")
 	else:
-		print "Cell Broadcast property %s is changed to %s" % (property, value)
-	print "\nPress ENTER to continue"
+		print("Cell Broadcast property %s is changed to %s" % (property, value))
+	print("\nPress ENTER to continue")
 
 def incoming_broadcast(text, topic):
-	print "Broadcast msg: %s \n Topic channel: %s" % (text, topic)
-	print "\nPress ENTER to continue"
+	print("Broadcast msg: %s \n Topic channel: %s" % (text, topic))
+	print("\nPress ENTER to continue")
 
 def emergency_broadcast(text, properties):
 	emergType = properties["EmergencyType"]
 	emergAlert = properties["EmergencyAlert"]
 
-	print "Broadcast msg: %s \n\t Type: %s \n\t Alert: %s \n\t Popup: %s" \
-		% (text, emergType, emergAlert, popup)
+	print("Broadcast msg: %s \n\t Type: %s \n\t Alert: %s \n\t Popup: %s" \
+		% (text, emergType, emergAlert, popup))
 
 	if properties["Popup"] == True:
-		print "Popup required."
+		print("Popup required.")
 
-	print "\nPress ENTER to continue"
+	print("\nPress ENTER to continue")
 
 def set_cbs_state(cbs, state):
 	if state == True:
-		print "Activating cell broadcast..."
+		print("Activating cell broadcast...")
 		cbs.SetProperty("Powered", dbus.Boolean(1))
 	else:
-		print "Deactivating cell broadcast..."
+		print("Deactivating cell broadcast...")
 		cbs.SetProperty("Powered", dbus.Boolean(0))
-	print "-----------------------------------------------------------"
+	print("-----------------------------------------------------------")
 
 def print_cbs_properties(cbs):
 	properties = cbs.GetProperties()
-	print "---------------------PROPERTIES----------------------------"
+	print("---------------------PROPERTIES----------------------------")
 	for p in properties:
 		if len(properties[p].__str__()) > 0:
 			if p == "Powered":
 				if properties[p] == True:
-					print "Cell Broadcast is Activated."
+					print("Cell Broadcast is Activated.")
 				else:
-					print "Cell Broadcast is Deactivated."
+					print("Cell Broadcast is Deactivated.")
 			elif p == "Topics":
-				print "Currently set CBS %s are: %s" \
-					% (p, properties[p])
+				print("Currently set CBS %s are: %s" \
+					% (p, properties[p]))
 				topics_available = True
 		else:
-			print "Cell Broadcast %s value empty" % (p)
-	print "-----------------------------------------------------------"
+			print("Cell Broadcast %s value empty" % (p))
+	print("-----------------------------------------------------------")
 
 def set_topics(cbs):
 	print_cbs_properties(cbs)
@@ -78,7 +78,7 @@
 	invalidData = False;
 	index = 0
 
-	topics = raw_input('Enter the topic ID(s) you want to register to: ')
+	topics = input('Enter the topic ID(s) you want to register to: ')
 
 	while index < len(topics):
 		if topics[index] == ',' or topics[index] == '-':
@@ -86,27 +86,27 @@
 		elif topics[index] >= '0' and topics[index] <= '9':
 			topicTemp = topicTemp + topics[index]
 		else:
-			print "Invalid char. \"%s\" entered. Topic not set." \
-				% (topics[index])
+			print("Invalid char. \"%s\" entered. Topic not set." \
+				% (topics[index]))
 			invalidData = True
 			break
 
 		if topicTemp:
 			if int(topicTemp) > 999:
 				invalidData = True
-				print "Invalid Topic ID %s (range 0-999). \
-					\nCould not register." % topicTemp
+				print("Invalid Topic ID %s (range 0-999). \
+					\nCould not register." % topicTemp)
 
 		index = index + 1
 
 	if invalidData == False:
 		try:
-			print "Setting Cell Broadcast topics..."
+			print("Setting Cell Broadcast topics...")
 			cbs.SetProperty("Topics", topics);
-		except dbus.DBusException, e:
-			print "Unable to set topic: ", e
+		except dbus.DBusException as e:
+			print("Unable to set topic: %s" % e)
 
-	print "-----------------------------------------------------------"
+	print("-----------------------------------------------------------")
 
 def get_serving_cell_name(netReg):
 	wasFound = False;
@@ -115,20 +115,20 @@
 	for p in properties:
 		if p == "BaseStation":
 			if len(properties[p].__str__()) > 0:
-				print "Current serving cell name: %s" \
-					% (properties["BaseStation"])
+				print("Current serving cell name: %s" \
+					% (properties["BaseStation"]))
 				wasFound = True;
 			else:
-				print "Current Serving cell name empty. \
-					Base Station CBS not available."
+				print("Current Serving cell name empty. \
+					Base Station CBS not available.")
 
 	if wasFound == False:
-		print "Base Station parameter not found. \
-			\nBase Station CBS not available."
-	print "-----------------------------------------------------------"
+		print("Base Station parameter not found. \
+			\nBase Station CBS not available.")
+	print("-----------------------------------------------------------")
 
-def stdin_handler(fd, condition, cbs, netReg):
-	in_key = os.read(fd.fileno(), 160).rstrip()
+def stdin_handler(channel, condition, cbs, netReg):
+	in_key = os.read(channel.unix_get_fd(), 160).rstrip().decode('UTF-8')
 
 	if in_key == '0':
 		set_cbs_state(cbs, True)
@@ -151,7 +151,7 @@
 	elif in_key == 'x':
 		sys.exit(1)
 
-	print '\n' * 2
+	print('\n' * 2)
 	print_menu()
 
 	return True
@@ -177,12 +177,13 @@
 	cbs.connect_to_signal("IncomingBroadcast", incoming_broadcast)
 	cbs.connect_to_signal("EmergencyBroadcast", emergency_broadcast)
 
-	print '\n' * 2
+	print('\n' * 2)
 
 	print_menu()
 
-	gobject.io_add_watch(sys.stdin, gobject.IO_IN, stdin_handler, cbs, \
-				netReg)
+	GLib.io_add_watch(GLib.IOChannel(filedes=sys.stdin.fileno()),
+		   GLib.PRIORITY_DEFAULT, GLib.IO_IN, stdin_handler, cbs, \
+		   netReg)
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-gnss'
--- test/test-gnss	2011-03-28 23:06:59 +0000
+++ test/test-gnss	2014-02-28 20:44:46 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 import sys
 import os
 
@@ -15,51 +15,51 @@
 	@dbus.service.method(AGENT_INTERFACE,
 					in_signature="", out_signature="")
 	def Release(self):
-		print "Release"
+		print("Release")
 		mainloop.quit()
 
 	@dbus.service.method(AGENT_INTERFACE,
 					in_signature="s", out_signature="")
 	def Request(self, xml):
-		print "positioning data: %s" % (xml)
+		print("positioning data: %s" % (xml))
 
 	@dbus.service.method(AGENT_INTERFACE,
 					in_signature="", out_signature="")
 	def ResetAssistanceData(self):
-		print "Reset Assistance Data request received"
+		print("Reset Assistance Data request received")
 
 def print_menu():
-	print "Select test case"
-	print "-----------------------------------------------------------"
-	print "[0] SendPositioningElement"
-	print "[1] RegisterPositioningRequestAgent"
-	print "[2] UnregisterPositioningRequestAgent"
-	print "[x] Exit"
-	print "-----------------------------------------------------------"
+	print("Select test case")
+	print("-----------------------------------------------------------")
+	print("[0] SendPositioningElement")
+	print("[1] RegisterPositioningRequestAgent")
+	print("[2] UnregisterPositioningRequestAgent")
+	print("[x] Exit")
+	print("-----------------------------------------------------------")
 
-def stdin_handler(fd, condition, gnss, path):
-	in_key = os.read(fd.fileno(), 8).rstrip()
+def stdin_handler(channel, condition, gnss, path):
+	in_key = os.read(channel.unix_get_fd(), 160).rstrip().decode('UTF-8')
 	if in_key == '0':
-		xml = raw_input('type the element and press enter: ')
+		xml = input('type the element and press enter: ')
 		try:
 			gnss.SendPositioningElement(dbus.String(xml))
-			print "ok"
-		except dbus.DBusException, e:
-			print "Unable to send positioning element"
+			print("ok")
+		except dbus.DBusException as e:
+			print("Unable to send positioning element")
 
 	elif in_key == '1':
 		try:
 			gnss.RegisterPositioningRequestAgent("/test/posagent")
-			print "ok"
-		except dbus.DBusException, e:
-			print "Unable to register positioning agent"
+			print("ok")
+		except dbus.DBusException as e:
+			print("Unable to register positioning agent")
 
 	elif in_key == '2':
 		try:
 			gnss.UnregisterPositioningRequestAgent(path)
-			print "ok"
-		except dbus.DBusException, e:
-			print "Unable to unregister positioning agent"
+			print("ok")
+		except dbus.DBusException as e:
+			print("Unable to unregister positioning agent")
 	elif in_key == 'x':
 		sys.exit(1)
 
@@ -87,7 +87,8 @@
 
 	print_menu()
 
-	gobject.io_add_watch(sys.stdin, gobject.IO_IN, stdin_handler,
-				gnss, path)
-	mainloop = gobject.MainLoop()
+	GLib.io_add_watch(GLib.IOChannel(filedes=sys.stdin.fileno()),
+		   GLib.PRIORITY_DEFAULT, GLib.IO_IN, stdin_handler,
+		   gnss, path)
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-message-waiting'
--- test/test-message-waiting	2011-03-11 20:00:36 +0000
+++ test/test-message-waiting	2014-02-28 20:44:46 +0000
@@ -1,17 +1,17 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 import sys
 import dbus
 import dbus.mainloop.glib
 
 def mw_property_changed(name, value):
 	if name == 'VoicemailMessageCount':
-		print "MessageWaiting property: '%s' changed to '%d'" %\
-			(name,value)
+		print("MessageWaiting property: '%s' changed to '%d'" %\
+			(name,value))
 	else:
-		print "MessageWaiting property: '%s' changed to '%s'" %\
-			(name,value)
+		print("MessageWaiting property: '%s' changed to '%s'" %\
+			(name,value))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -30,11 +30,11 @@
 
 	properties = mw.GetProperties()
 
-	print "Voicemail waiting: %s" % (properties['VoicemailWaiting'])
-	print "Voicemail message count: %d" %\
-		(properties['VoicemailMessageCount'])
-	print "Voicemail mailbox number: %s" %\
-		(properties['VoicemailMailboxNumber'])
+	print("Voicemail waiting: %s" % (properties['VoicemailWaiting']))
+	print("Voicemail message count: %d" %\
+		(properties['VoicemailMessageCount']))
+	print("Voicemail mailbox number: %s" %\
+		(properties['VoicemailMailboxNumber']))
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-modem'
--- test/test-modem	2011-03-08 19:34:24 +0000
+++ test/test-modem	2014-02-28 20:44:46 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(name, value):
-	print "Modem property %s changed to %s" % (name, value)
+	print("Modem property %s changed to %s" % (name, value))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -24,42 +24,42 @@
 
 	properties = modem.GetProperties()
 
-	if properties.has_key('Name'):
-		print "Name: %s" % (properties['Name'])
-
-	if properties.has_key('Manufacturer'):
-		print "Manufacturer: %s" % (properties['Manufacturer'])
-
-	if properties.has_key('Model'):
-		print "Model: %s" % (properties['Model'])
-
-	if properties.has_key('Revision'):
-		print "Revision: %s" % (properties['Revision'])
-
-	if properties.has_key('Serial'):
-		print "Serial: %s" % (properties['Serial'])
-
-	if properties.has_key('Powered'):
-		print "Powered: %s" % (properties['Powered'])
-
-	if properties.has_key('Online'):
-		print "Online: %s" % (properties['Online'])
-
-	if properties.has_key('Lockdown'):
-		print "Lockdown: %s" % (properties['Lockdown'])
-
-	if properties.has_key('Emergency'):
-		print "Emergency: %s" % (properties['Emergency'])
-
-	if properties.has_key('Features'):
-		print "Features:"
+	if 'Name' in properties:
+		print("Name: %s" % (properties['Name']))
+
+	if 'Manufacturer' in properties:
+		print("Manufacturer: %s" % (properties['Manufacturer']))
+
+	if 'Model' in properties:
+		print("Model: %s" % (properties['Model']))
+
+	if 'Revision' in properties:
+		print("Revision: %s" % (properties['Revision']))
+
+	if 'Serial' in properties:
+		print("Serial: %s" % (properties['Serial']))
+
+	if 'Powered' in properties:
+		print("Powered: %s" % (properties['Powered']))
+
+	if 'Online' in properties:
+		print("Online: %s" % (properties['Online']))
+
+	if 'Lockdown' in properties:
+		print("Lockdown: %s" % (properties['Lockdown']))
+
+	if 'Emergency' in properties:
+		print("Emergency: %s" % (properties['Emergency']))
+
+	if 'Features' in properties:
+		print("Features:")
 		for feature in properties["Features"]:
-			print "    [ %s ]" % (feature)
+			print("    [ %s ]" % (feature))
 
-	if properties.has_key('Interfaces'):
-		print "Interfaces:"
+	if 'Interfaces' in properties:
+		print("Interfaces:")
 		for interface in properties["Interfaces"]:
-			print "    [ %s ]" % (interface)
+			print("    [ %s ]" % (interface))
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-network-registration'
--- test/test-network-registration	2011-09-29 19:03:45 +0000
+++ test/test-network-registration	2014-02-28 20:44:46 +0000
@@ -1,23 +1,23 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 import sys
 import dbus
 import dbus.mainloop.glib
 
 def network_property_changed(name, value):
-	print "Network Registration property '%s' changed to '%s'" %\
-		(name, value)
+	print("Network Registration property '%s' changed to '%s'" %\
+		(name, value))
 
 	if name == 'Name' and canexit:
 		mainloop.quit()
 
 if __name__ == "__main__":
 	if len(sys.argv) < 2:
-		print "Usage: %s [modem] <path> - Register to PLMN on <path>" %\
-			(sys.argv[0])
-		print "Usage: %s [modem] default - Register to default PLMN" %\
-			(sys.argv[0])
+		print("Usage: %s [modem] <path> - Register to PLMN on <path>" %\
+			(sys.argv[0]))
+		print("Usage: %s [modem] default - Register to default PLMN" %\
+			(sys.argv[0]))
 		sys.exit(1)
 
 	canexit = False
@@ -44,15 +44,15 @@
 
 	props = netreg.GetProperties()
 
-	print "Status is: '%s', Operator Name is: '%s'" %\
-		(props['Status'], props['Name'])
-
-	if props.has_key('LocationAreaCode') and props.has_key('CellId'):
-		print "Location: '%d', Cell: '%d'" %\
-			(props['LocationAreaCode'], props['CellId'])
-
-	if props.has_key('Technology'):
-		print "Technology: '%s'" % (props['Technology'])
+	print("Status is: '%s', Operator Name is: '%s'" %\
+		(props['Status'], props['Name']))
+
+	if 'LocationAreaCode' in props and 'CellId' in props:
+		print("Location: '%d', Cell: '%d'" %\
+			(props['LocationAreaCode'], props['CellId']))
+
+	if 'Technology' in props:
+		print("Technology: '%s'" % (props['Technology']))
 
 	try:
 		if plmn == 'default':
@@ -61,11 +61,11 @@
 			obj = bus.get_object('org.ofono', plmn);
 			op = dbus.Interface(obj, 'org.ofono.NetworkOperator')
 			op.Register()
-	except dbus.DBusException, e:
-		print "Unable to register: ", e
+	except dbus.DBusException as e:
+		print("Unable to register: %s" % e)
 		sys.exit(1)
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-phonebook'
--- test/test-phonebook	2011-09-29 19:03:45 +0000
+++ test/test-phonebook	2014-02-28 20:44:46 +0000
@@ -20,4 +20,4 @@
 	phonebook = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.Phonebook')
 
-	print phonebook.Import(timeout=100)
+	print(phonebook.Import(timeout=100))

=== modified file 'test/test-push-notification'
--- test/test-push-notification	2010-12-03 12:47:40 +0000
+++ test/test-push-notification	2014-02-28 20:44:46 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import sys
 import dbus
@@ -11,16 +11,16 @@
 	@dbus.service.method("org.ofono.PushNotificationAgent",
 					in_signature="", out_signature="")
 	def Release(self):
-		print "Release"
+		print("Release")
 		mainloop.quit()
 
 	@dbus.service.method("org.ofono.PushNotificationAgent",
 				in_signature="aya{sv}", out_signature="")
 	def ReceiveNotification(self, data, props):
 		for key in props.keys():
-			print "Key: %s, Value: %s" % (key, props[key])
+			print("Key: %s, Value: %s" % (key, props[key]))
 
-		print "Received notification of size: %d" % len(data)
+		print("Received notification of size: %d" % len(data))
 
 if __name__ == '__main__':
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -41,9 +41,9 @@
 	path = "/test/agent"
 	agent = PushNotificationAgent(bus, path)
 	pn.RegisterAgent(path)
-	print "Agent registered"
+	print("Agent registered")
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 
 	try:
 		mainloop.run()

=== modified file 'test/test-smart-messaging'
--- test/test-smart-messaging	2010-12-03 12:47:40 +0000
+++ test/test-smart-messaging	2014-02-28 20:44:46 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import sys
 import dbus
@@ -11,34 +11,34 @@
 	@dbus.service.method("org.ofono.SmartMessagingAgent",
 					in_signature="", out_signature="")
 	def Release(self):
-		print "Release"
+		print("Release")
 		mainloop.quit()
 
 	@dbus.service.method("org.ofono.SmartMessagingAgent",
 				in_signature="aya{sv}", out_signature="")
 	def ReceiveBusinessCard(self, data, props):
 		for key in props.keys():
-			print "Key: %s, Value: %s" % (key, props[key])
+			print("Key: %s, Value: %s" % (key, props[key]))
 
 		string = ""
 		for byte in data:
 			string += str(byte)
 
-		print "Received Business Card:"
-		print string
+		print("Received Business Card:")
+		print(string)
 
 	@dbus.service.method("org.ofono.SmartMessagingAgent",
 				in_signature="aya{sv}", out_signature="")
 	def ReceiveAppointment(self, data, props):
 		for key in props.keys():
-			print "Key: %s, Value: %s" % (key, props[key])
+			print("Key: %s, Value: %s" % (key, props[key]))
 
 		string = ""
 		for byte in data:
 			string += str(byte)
 
-		print "Received Appointment:"
-		print string
+		print("Received Appointment:")
+		print(string)
 
 if __name__ == '__main__':
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -59,9 +59,9 @@
 	path = "/test/agent"
 	agent = SmartMessagingAgent(bus, path)
 	pn.RegisterAgent(path)
-	print "Agent registered"
+	print("Agent registered")
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 
 	try:
 		mainloop.run()

=== modified file 'test/test-sms'
--- test/test-sms	2011-09-29 19:03:45 +0000
+++ test/test-sms	2014-02-28 20:44:46 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import gobject
+from gi.repository import GLib
 import sys
 import os
 
@@ -20,119 +20,119 @@
 		os.system('CLS')
 
 	else:
-		print '\n' * numlines
+		print('\n' * numlines)
 
 def print_menu():
-	print "Select test case"
-	print "-----------------------------------------------------------"
-	print "[0] Send SMS"
-	print "[1] Enable delivery reports"
-	print "[2] Disable delivery reports"
-	print "[3] Set Service Center Address"
-	print "[4] Set PS-only Bearer"
-	print "[5] Set CS-only Bearer"
-	print "[6] Set PS-preferred Bearer"
-	print "[7] Set CS-preferred Bearer"
-	print "[x] Exit"
-	print "-----------------------------------------------------------"
+	print("Select test case")
+	print("-----------------------------------------------------------")
+	print("[0] Send SMS")
+	print("[1] Enable delivery reports")
+	print("[2] Disable delivery reports")
+	print("[3] Set Service Center Address")
+	print("[4] Set PS-only Bearer")
+	print("[5] Set CS-only Bearer")
+	print("[6] Set PS-preferred Bearer")
+	print("[7] Set CS-preferred Bearer")
+	print("[x] Exit")
+	print("-----------------------------------------------------------")
 
 def print_send_sms_menu():
-	print "Select SMS type"
-	print "-----------------------------------------------------------"
-	print "[1] Default SMS"
-	print "[2] Long SMS > 160 characters"
-	print "[3] SMS with national characters"
-	print "-----------------------------------------------------------"
+	print("Select SMS type")
+	print("-----------------------------------------------------------")
+	print("[1] Default SMS")
+	print("[2] Long SMS > 160 characters")
+	print("[3] SMS with national characters")
+	print("-----------------------------------------------------------")
 
 def message_delivery_report(sms, value):
 	try:
 		sms.SetProperty("UseDeliveryReports", dbus.Boolean(value))
 
-	except dbus.DBusException, e:
+	except dbus.DBusException as e:
 		if value == 1:
-			print "Unable to activate Delivery Reports - FAIL"
+			print("Unable to activate Delivery Reports - FAIL")
 
 		if value == 0:
-			print "Unable to deactivate Delivery Reports - FAIL"
+			print("Unable to deactivate Delivery Reports - FAIL")
 
 def message_service_center_address(sms, value):
 	try:
 		sms.SetProperty("ServiceCenterAddress",dbus.String(value))
-	except dbus.DBusException, e:
-		print "Unable to set correct Service Center Address - FAIL"
+	except dbus.DBusException as e:
+		print("Unable to set correct Service Center Address - FAIL")
 
 def message_bearer(sms, value):
 	try:
 		sms.SetProperty("Bearer", dbus.String(value))
-	except dbus.DBusException, e:
-		print "Unable to set Bearer[%s] - FAIL" % (value)
+	except dbus.DBusException as e:
+		print("Unable to set Bearer[%s] - FAIL" % (value))
 
 
 def message_send(sms, number, value):
 	sms.SendMessage(dbus.String(number), value)
 
 def property_changed(property, value):
-	print "[1]:Message Manager property %s changed to %s" %\
-			(property, value)
-	print "[1]:press ENTER"
+	print("[1]:Message Manager property %s changed to %s" %\
+			(property, value))
+	print("[1]:press ENTER")
 
 def immediate_message(property, value):
-	print "[2]:Message Manager immediate message"
-	print "[2]:Text::%s" % (property)
+	print("[2]:Message Manager immediate message")
+	print("[2]:Text::%s" % (property))
 	for key in value.keys():
 		val = str(value[key])
-		print "[2]:%s = %s" % (key, val)
+		print("[2]:%s = %s" % (key, val))
 
-	print "[2]:press ENTER"
+	print("[2]:press ENTER")
 
 def incoming_message(property, value):
-	print "[3]:Message Manager incoming message"
-	print "[3]:Text::%s" % (property)
+	print("[3]:Message Manager incoming message")
+	print("[3]:Text::%s" % (property))
 	for key in value.keys():
 		val = str(value[key])
-		print "[3]:%s = %s" % (key, val)
+		print("[3]:%s = %s" % (key, val))
 
-	print "[3]:press ENTER"
+	print("[3]:press ENTER")
 
 def message_added(property, value):
-	print "[4]:Message Manager[Added]"
-	print "[4]:%s"% (property)
+	print("[4]:Message Manager[Added]")
+	print("[4]:%s"% (property))
 
 	for key in value.keys():
 		val = str(value[key])
-		print "[4]:%s = %s" % (key, val)
+		print("[4]:%s = %s" % (key, val))
 
-	print "[4]:press ENTER"
+	print("[4]:press ENTER")
 
 def message_removed(property):
-	print "[5]:Message Manager [removed]"
-	print "[5]: %s" % (property)
-	print "[5]:press ENTER"
+	print("[5]:Message Manager [removed]")
+	print("[5]: %s" % (property))
+	print("[5]:press ENTER")
 
 def print_sms_properties(sms):
 	global SCA
 	properties = sms.GetProperties()
-	print "---------------------PROPERTIES----------------------------"
+	print("---------------------PROPERTIES----------------------------")
 	for p in properties:
 		if len(properties[p].__str__()) > 0:
-			print "%s Message Manager rule is: %s" %\
-					(p, properties[p])
-			print "------------------------------------------" \
-				"-----------------"
+			print("%s Message Manager rule is: %s" %\
+					(p, properties[p]))
+			print("------------------------------------------" \
+				"-----------------")
 			if p == "ServiceCenterAddress":
 				SCA = properties[p]
 		else:
-			print "%s Message Manager rule disabled" % (p)
+			print("%s Message Manager rule disabled" % (p))
 
-def stdin_handler(fd, condition, sms, value, number):
+def stdin_handler(channel, condition, sms, value, number):
 	global lock
-	in_key = os.read(fd.fileno(), 160).rstrip()
+	in_key = os.read(channel.unix_get_fd(), 160).rstrip().decode('UTF-8')
 
 	if lock == "off":
 		lock = "on"
 		if in_key == '0':
 			print_send_sms_menu()
-			sms_type = raw_input('Select SMS type: ')
+			sms_type = input('Select SMS type: ')
 
 			if sms_type == '1':
 				message_send(sms, number, value)
@@ -150,49 +150,49 @@
 
 		elif in_key == '1':
 			message_delivery_report(sms, 1)
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms, number, ("(1)" + value +
 						": UseDeliveryReports[TRUE]"))
 
 		elif in_key == '2':
 			message_delivery_report(sms, 0)
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms, number, ("(2) " + value +
 						": UseDeliveryReports[FALSE]"))
 
 		elif in_key == '3':
 			message_service_center_address(sms, SCA)
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms, number, ("(3) " + value +
 						": ServiceCenterAddress"))
 
 		elif in_key == '4':
 			message_bearer(sms, "ps-only")
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms, number, ("(4) " + value +
 						": Bearer[ps-only]"))
 
 		elif in_key == '5':
 			message_bearer(sms, "cs-only")
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms, number, ("(5) " + value +
 						": Bearer[cs-only]"))
 
 		elif in_key == '6':
 			message_bearer(sms, "ps-preferred")
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms, number, ("(6) " + value +
 						": Bearer[ps-preferred]"))
 
 		elif in_key == '7':
 			message_bearer(sms, "cs-preferred")
-			send_msg = raw_input('Send test message[y/n]?: ')
+			send_msg = input('Send test message[y/n]?: ')
 			if send_msg == 'y':
 				message_send(sms,number, ("(7) " + value +
 						": Bearer[cs-preferred]"))
@@ -210,7 +210,7 @@
 if __name__ == "__main__":
 
 	if (len(sys.argv) < 3):
-		print "Usage: %s  [modem] <phone_number> <test_message>" % (sys.argv[0])
+		print("Usage: %s  [modem] <phone_number> <test_message>" % (sys.argv[0]))
 		sys.exit(1)
 
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -241,7 +241,8 @@
 	print_sms_properties(sms)
 	print_menu()
 
-	gobject.io_add_watch(sys.stdin, gobject.IO_IN, stdin_handler,
-				sms, value, number)
-	mainloop = gobject.MainLoop()
+	GLib.io_add_watch(GLib.IOChannel(filedes=sys.stdin.fileno()),
+		   GLib.PRIORITY_DEFAULT, GLib.IOCondition.IN, stdin_handler,
+		   sms, value, number)
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-ss'
--- test/test-ss	2012-05-30 13:50:21 +0000
+++ test/test-ss	2014-02-28 20:44:46 +0000
@@ -22,21 +22,21 @@
 
 try:
 	ss_type, properties = ss.Initiate(ss_code, timeout=100)
-except dbus.DBusException, e:
-	print "Unable to perform operation: ", e
+except dbus.DBusException as e:
+	print("Unable to perform operation: %s" % e)
 	sys.exit(1);
 
 if (ss_type == "CallBarring"):
-	print "%s : Operation [ %s ] Service Type [ %s ]" % (ss_type, properties[0], properties[1])
+	print("%s : Operation [ %s ] Service Type [ %s ]" % (ss_type, properties[0], properties[1]))
 	for key in properties[2]:
-		print "%s : %s" % (key, properties[2][key])
+		print("%s : %s" % (key, properties[2][key]))
 elif (ss_type == "CallForwarding"):
-	print "%s : Operation [ %s ] Service Type [ %s ]" % (ss_type, properties[0], properties[1])
+	print("%s : Operation [ %s ] Service Type [ %s ]" % (ss_type, properties[0], properties[1]))
 	for key in properties[2]:
-		print "%s : %s" % (key, properties[2][key])
+		print("%s : %s" % (key, properties[2][key]))
 elif (ss_type == "CallWaiting"):
-	print "%s : Operation [ %s ]" % (ss_type, properties[0])
+	print("%s : Operation [ %s ]" % (ss_type, properties[0]))
 	for key in properties[1]:
-		print "%s : %s" % (key, properties[1][key])
+		print("%s : %s" % (key, properties[1][key]))
 else:
-	print "%s : Operation [ %s ] Status [ %s ]" % (ss_type, properties[0], properties[1])
+	print("%s : Operation [ %s ] Status [ %s ]" % (ss_type, properties[0], properties[1]))

=== modified file 'test/test-ss-control-cb'
--- test/test-ss-control-cb	2010-09-09 19:38:14 +0000
+++ test/test-ss-control-cb	2014-02-28 20:44:46 +0000
@@ -1,18 +1,18 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
-	print "CallBarring property %s changed to %s" % (property, value)
+	print("CallBarring property %s changed to %s" % (property, value))
 
 def print_properties(cb):
-        properties = cb.GetProperties()
+	properties = cb.GetProperties()
 
 	for p in properties:
-		print "property %s, value: %s" % (p, properties[p])
+	    print("property %s, value: %s" % (p, properties[p]))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -27,69 +27,69 @@
 	cb = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
                                                         'org.ofono.CallBarring')
 
-        cb.connect_to_signal("PropertyChanged", property_changed)
+	cb.connect_to_signal("PropertyChanged", property_changed)
 
 	ss = dbus.Interface(bus.get_object('org.ofono', modems[0]),
 							'org.ofono.SupplementaryServices')
 
 	print_properties(cb)
 
-	print "Trying invalid SS request for CB"
-	try:
-		print ss.Initiate("*33#456666")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CB"
-	try:
-		print ss.Initiate("*33*ABC#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CB"
-	try:
-		print ss.Initiate("*33**ABC#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CB"
-	try:
-		print ss.Initiate("*33***12#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Query Outgoing All"
-	print ss.Initiate("*#33#")
-
-	print "Query Outgoing International"
-	print ss.Initiate("*#331#")
-
-	print "Query Outgoing except home country"
-	print ss.Initiate("*#332#")
-
-	print "Query Incoming All"
-	print ss.Initiate("*#35#")
-
-	print "Query Incoming while Roaming"
-	print ss.Initiate("*#351#")
-
-	print "Query All Outgoing"
-	print ss.Initiate("*#333#")
-
-	print "Query All Incoming"
-	print ss.Initiate("*#353#")
-
-	print "Query All"
-	print ss.Initiate("*#330#")
-
-	print "Enable Barring for Outgoing International calls for Voice"
-	print ss.Initiate("*33*3579*11#")
+	print("Trying invalid SS request for CB")
+	try:
+		print(ss.Initiate("*33#456666"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CB")
+	try:
+		print(ss.Initiate("*33*ABC#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CB")
+	try:
+		print(ss.Initiate("*33**ABC#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CB")
+	try:
+		print(ss.Initiate("*33***12#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Query Outgoing All")
+	print(ss.Initiate("*#33#"))
+
+	print("Query Outgoing International")
+	print(ss.Initiate("*#331#"))
+
+	print("Query Outgoing except home country")
+	print(ss.Initiate("*#332#"))
+
+	print("Query Incoming All")
+	print(ss.Initiate("*#35#"))
+
+	print("Query Incoming while Roaming")
+	print(ss.Initiate("*#351#"))
+
+	print("Query All Outgoing")
+	print(ss.Initiate("*#333#"))
+
+	print("Query All Incoming")
+	print(ss.Initiate("*#353#"))
+
+	print("Query All")
+	print(ss.Initiate("*#330#"))
+
+	print("Enable Barring for Outgoing International calls for Voice")
+	print(ss.Initiate("*33*3579*11#"))
 
 	print_properties(cb)
 
-	print "Disable All Barrings"
-	print ss.Initiate("#330*3579#")
+	print("Disable All Barrings")
+	print(ss.Initiate("#330*3579#"))
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()
 

=== modified file 'test/test-ss-control-cf'
--- test/test-ss-control-cf	2010-09-09 19:38:14 +0000
+++ test/test-ss-control-cf	2014-02-28 20:44:46 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
-	print "CallForwarding property %s changed to %s" % (property, value)
+	print("CallForwarding property %s changed to %s" % (property, value))
 
 def print_properties(cf):
 	properties = cf.GetProperties()
@@ -17,7 +17,7 @@
 		else:
 			value = "disabled"
 
-		print "%s call forwarding rule: %s" % (p, value)
+		print("%s call forwarding rule: %s" % (p, value))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -42,34 +42,34 @@
 	print_properties(cf)
 
 	# Busy To +155542, for Voice
-	print "Setting Busy Voice rule to +155542"
-	print ss.Initiate("*67*+155542*11#")
+	print("Setting Busy Voice rule to +155542")
+	print(ss.Initiate("*67*+155542*11#"))
 	print_properties(cf)
 
 	# Not Reachable to +155543, Voice
-	print "Setting Voice Not Reachable rule to +155543"
-	print ss.Initiate("**62*+155543*11#")
+	print("Setting Voice Not Reachable rule to +155543")
+	print(ss.Initiate("**62*+155543*11#"))
 
 	# Not Reachable to +155544, Voice service
-	print "Setting Voice No Reply rule to +155544, timeout=30"
-	print ss.Initiate("**61*+155544*11*30#")
+	print("Setting Voice No Reply rule to +155544, timeout=30")
+	print(ss.Initiate("**61*+155544*11*30#"))
 
 	# Unconditional to +155547, Voice
-	print "Setting Unconditional for Voice to +155545"
-	print ss.Initiate("*21*+155545*10#")
+	print("Setting Unconditional for Voice to +155545")
+	print(ss.Initiate("*21*+155545*10#"))
 
 	print_properties(cf)
 
-	print "Query all voice forwardings"
-	print ss.Initiate("*#002**11#")
+	print("Query all voice forwardings")
+	print(ss.Initiate("*#002**11#"))
 
-	print "Query no reply voice forwardings"
-	print ss.Initiate("*#61**11#")
+	print("Query no reply voice forwardings")
+	print(ss.Initiate("*#61**11#"))
 
 	# Deactivate everything
-	print "Deactivating everything"
-	print ss.Initiate("##002#")
+	print("Deactivating everything")
+	print(ss.Initiate("##002#"))
 	print_properties(cf)
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/test-ss-control-cs'
--- test/test-ss-control-cs	2010-12-17 00:40:19 +0000
+++ test/test-ss-control-cs	2014-02-28 20:44:46 +0000
@@ -1,18 +1,18 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
-	print "CallSettings property %s changed to %s" % (property, value)
+	print("CallSettings property %s changed to %s" % (property, value))
 
 def print_properties(cs):
-        properties = cs.GetProperties()
+	properties = cs.GetProperties()
 
 	for p in properties:
-		print "property %s, value: %s" % (p, properties[p])
+		print("property %s, value: %s" % (p, properties[p]))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -27,90 +27,90 @@
 	cs = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
                                                         'org.ofono.CallSettings')
 
-        cs.connect_to_signal("PropertyChanged", property_changed)
+	cs.connect_to_signal("PropertyChanged", property_changed)
 
 	ss = dbus.Interface(bus.get_object('org.ofono', modems[0][0]),
 							'org.ofono.SupplementaryServices')
 
 	print_properties(cs)
 
-	print "Trying invalid SS request for CLIR"
-	try:
-		print ss.Initiate("*31#456666")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CLIR"
-	try:
-		print ss.Initiate("*31*455*4#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CLIR"
-	try:
-		print ss.Initiate("*31**44435#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Query CLIP"
-	print ss.Initiate("*#30#")
-
-	print "Query CNAP"
-	print ss.Initiate("*#300#")
-
-	print "Query COLP"
-	print ss.Initiate("*#76#")
-
-	print "Query CLIR"
-	print ss.Initiate("*#31#")
-
-	print "Activate CLIR"
-	print ss.Initiate("*31#")
-
-	print_properties(cs)
-
-	print "Deactivate CLIR"
-	print ss.Initiate("#31#")
-
-	print_properties(cs)
-
-	print "Trying invalid SS request for CW"
-	try:
-		print ss.Initiate("*43#456666")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CW"
-	try:
-		print ss.Initiate("*43*455*4#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Trying invalid SS request for CW"
-	try:
-		print ss.Initiate("*43**44435#")
-	except dbus.DBusException, e:
-		print "Failed with %s - Good" % e
-
-	print "Query CW"
-	print ss.Initiate("*#43#")
-
-	print "Query CW, only Voice"
-	print ss.Initiate("*#43*11#")
-
-	print "Query CW, only Fax"
-	print ss.Initiate("*#43*13#")
-
-	print "Disable CW for everything"
-	print ss.Initiate("#43#");
-
-	print_properties(cs)
-
-	print "Enable CW for Voice"
-	print ss.Initiate("*43*11#")
-
-	print_properties(cs)
-
-	mainloop = gobject.MainLoop()
+	print("Trying invalid SS request for CLIR")
+	try:
+		print(ss.Initiate("*31#456666"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CLIR")
+	try:
+		print(ss.Initiate("*31*455*4#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CLIR")
+	try:
+		print(ss.Initiate("*31**44435#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Query CLIP")
+	print(ss.Initiate("*#30#"))
+
+	print("Query CNAP")
+	print(ss.Initiate("*#300#"))
+
+	print("Query COLP")
+	print(ss.Initiate("*#76#"))
+
+	print("Query CLIR")
+	print(ss.Initiate("*#31#"))
+
+	print("Activate CLIR")
+	print(ss.Initiate("*31#"))
+
+	print_properties(cs)
+
+	print("Deactivate CLIR")
+	print(ss.Initiate("#31#"))
+
+	print_properties(cs)
+
+	print("Trying invalid SS request for CW")
+	try:
+		print(ss.Initiate("*43#456666"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CW")
+	try:
+		print(ss.Initiate("*43*455*4#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Trying invalid SS request for CW")
+	try:
+		print(ss.Initiate("*43**44435#"))
+	except dbus.DBusException as e:
+		print("Failed with %s - Good" % e)
+
+	print("Query CW")
+	print(ss.Initiate("*#43#"))
+
+	print("Query CW, only Voice")
+	print(ss.Initiate("*#43*11#"))
+
+	print("Query CW, only Fax")
+	print(ss.Initiate("*#43*13#"))
+
+	print("Disable CW for everything")
+	print(ss.Initiate("#43#"));
+
+	print_properties(cs)
+
+	print("Enable CW for Voice")
+	print(ss.Initiate("*43*11#"))
+
+	print_properties(cs)
+
+	mainloop = GLib.MainLoop()
 	mainloop.run()
 

=== modified file 'test/test-stk-menu'
--- test/test-stk-menu	2012-11-28 16:31:14 +0000
+++ test/test-stk-menu	2014-02-28 20:44:46 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import gobject
+from gi.repository import GLib
 
 import sys
 import dbus
@@ -34,30 +34,30 @@
 		return False
 
 	def call_added(self, path, properties):
-		print "call added %s" % (path)
+		print("call added %s" % (path))
 		if (self.timeout_id > 0):
-			gobject.source_remove(self.timeout_id)
+			GLib.source_remove(self.timeout_id)
 			self.timeout_callback()
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="", out_signature="")
 	def Release(self):
-		print "Release"
+		print("Release")
 		if self.exit_on_release:
 			mainloop.quit()
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sya(sy)n", out_signature="y")
 	def RequestSelection(self, title, icon, items, default):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
 		index = 0
 		for item in items:
-			print "%d. %s (icon: %d)" % (index, item[0], item[1])
+			print("%d. %s (icon: %d)" % (index, item[0], item[1]))
 			index += 1
 
-		print "\nDefault: %d" % (default)
-		select = raw_input("Enter Selection (t, b):")
+		print("\nDefault: %d" % (default))
+		select = input("Enter Selection (t, b):")
 
 		if select == 'b':
 			raise GoBack("User wishes to go back")
@@ -71,10 +71,10 @@
 					async_callbacks=("reply_func",
 								"error_func"))
 	def DisplayText(self, title, icon, urgent, reply_func, error_func):
-		print "DisplayText (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		print "Urgent: (%d)" % (urgent)
-		key = raw_input("Press return to clear ('t' terminates, "
+		print("DisplayText (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		print("Urgent: (%d)" % (urgent))
+		key = input("Press return to clear ('t' terminates, "
 						"'b' goes back, 'n' busy, "
 						"'w' return and wait):")
 
@@ -91,23 +91,23 @@
 			raise Busy("User wishes to simulate busy screen")
 
 		if (seconds > 0):
-			print "Waiting for %d seconds" % (seconds)
+			print("Waiting for %d seconds" % (seconds))
 
 		self.timeout_reply_handler = reply_func
-		self.timeout_id = gobject.timeout_add_seconds(seconds,
+		self.timeout_id = GLib.timeout_add_seconds(seconds,
 							self.timeout_callback)
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sysyyb", out_signature="s")
 	def RequestInput(self, title, icon, default, min_chars, max_chars,
 				hide_typing):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		print "Default: (%s)" % (default)
-		print "Hide typing: (%s)" % (hide_typing)
-		print "Enter characters, min: %d, max: %d:" % (min_chars,
-								max_chars)
-		userin = raw_input("")
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		print("Default: (%s)" % (default))
+		print("Hide typing: (%s)" % (hide_typing))
+		print("Enter characters, min: %d, max: %d:" % (min_chars,
+								max_chars))
+		userin = input("")
 
 		return userin
 
@@ -115,13 +115,13 @@
 				in_signature="sysyyb", out_signature="s")
 	def RequestDigits(self, title, icon, default, min_chars, max_chars,
 				hide_typing):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		print "Default: (%s)" % (default)
-		print "Hide typing: (%s)" % (hide_typing)
-		print "Enter digits, min: %d, max: %d:" % (min_chars,
-								max_chars)
-		userin = raw_input("'t' terminates, 'b' goes back:")
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		print("Default: (%s)" % (default))
+		print("Hide typing: (%s)" % (hide_typing))
+		print("Enter digits, min: %d, max: %d:" % (min_chars,
+								max_chars))
+		userin = input("'t' terminates, 'b' goes back:")
 
 		if userin == 'b':
 			raise GoBack("User wishes to go back")
@@ -133,9 +133,9 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sy", out_signature="s")
 	def RequestKey(self, title, icon):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Enter Key (t, b):")
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		key = input("Enter Key (t, b):")
 
 		if key == 'b':
 			raise GoBack("User wishes to go back")
@@ -147,9 +147,9 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sy", out_signature="s")
 	def RequestDigit(self, title, icon):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Enter Digit (t, b):")
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		key = input("Enter Digit (t, b):")
 
 		if key == 'b':
 			raise GoBack("User wishes to go back")
@@ -161,9 +161,9 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sy", out_signature="s")
 	def RequestQuickDigit(self, title, icon):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Quick digit (0-9, *, #, t, b):")
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		key = input("Quick digit (0-9, *, #, t, b):")
 
 		if key == 'b':
 			raise GoBack("User wishes to go back")
@@ -175,9 +175,9 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sy", out_signature="b")
 	def RequestConfirmation(self, title, icon):
-		print "Title: (%s)" % (title)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Enter Confirmation (t, b, y, n):")
+		print("Title: (%s)" % (title))
+		print("Icon: (%d)" % (icon))
+		key = input("Enter Confirmation (t, b, y, n):")
 
 		if key == 'b':
 			raise GoBack("User wishes to go back")
@@ -191,9 +191,9 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sy", out_signature="b")
 	def ConfirmCallSetup(self, info, icon):
-		print "Information: (%s)" % (info)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Enter Confirmation (t, y, n):")
+		print("Information: (%s)" % (info))
+		print("Icon: (%d)" % (icon))
+		key = input("Enter Confirmation (t, y, n):")
 
 		if key == 't':
 			raise EndSession("User wishes to terminate session")
@@ -205,10 +205,10 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 				in_signature="sys", out_signature="b")
 	def ConfirmLaunchBrowser(self, info, icon, url):
-		print "Information: (%s)" % (info)
-		print "Icon: (%d)" % (icon)
-		print "URL (%s)" % (url)
-		key = raw_input("Enter Confirmation (y, n):")
+		print("Information: (%s)" % (info))
+		print("Icon: (%d)" % (icon))
+		print("URL (%s)" % (url))
+		key = input("Enter Confirmation (y, n):")
 
 		if key == 'y':
 			return True
@@ -218,38 +218,38 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="", out_signature="")
 	def Cancel(self):
-		print "Cancel"
+		print("Cancel")
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="ssy", out_signature="")
 	def PlayTone(self, tone, text, icon):
-		print "PlayTone: %s" % (tone)
-		print "Text: %s" % (text)
-		print "Icon: %d" % (icon)
+		print("PlayTone: %s" % (tone))
+		print("Text: %s" % (text))
+		print("Icon: %d" % (icon))
 
 		signal.signal(signal.SIGALRM, handler)
 		signal.alarm(5)
 
 		try:
-			key = raw_input("Press return to end before end of"
+			key = input("Press return to end before end of"
 							 " single tone (t):")
 			signal.alarm(0)
 
 			if key == 't':
 				raise EndSession("User wishes to terminate"
 								 " session")
-		except Exception, exc:
-			print exc
+		except Exception as exc:
+			print(exc)
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="ssy", out_signature="",
 					async_callbacks=("reply_func",
 								"error_func"))
 	def LoopTone(self, tone, text, icon, reply_func, error_func):
-		print "LoopTone: %s" % (tone)
-		print "Text: %s" % (text)
-		print "Icon: %d" % (icon)
-		key = raw_input("Press return to end before timeout "
+		print("LoopTone: %s" % (tone))
+		print("Text: %s" % (text))
+		print("Icon: %d" % (icon))
+		key = input("Press return to end before timeout "
 				"('t' terminates, 'w' return and wait):")
 
 		if key == 'w':
@@ -261,24 +261,24 @@
 			raise EndSession("User wishes to terminate session")
 
 		if (seconds > 0):
-			print "Waiting for %d seconds" % (seconds)
+			print("Waiting for %d seconds" % (seconds))
 
 		self.timeout_reply_handler = reply_func
-		self.timeout_id = gobject.timeout_add_seconds(seconds,
+		self.timeout_id = GLib.timeout_add_seconds(seconds,
 							self.timeout_callback)
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="sy", out_signature="")
 	def DisplayActionInformation(self, text, icon):
-		print "Text: %s" % (text)
-		print "Icon: %d" % (icon)
+		print("Text: %s" % (text))
+		print("Icon: %d" % (icon))
 
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="sy", out_signature="")
 	def DisplayAction(self, text, icon):
-		print "Text: (%s)" % (text)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Press 't' to terminate the session ")
+		print("Text: (%s)" % (text))
+		print("Icon: (%d)" % (icon))
+		key = input("Press 't' to terminate the session ")
 
 		if key == 't':
 			raise EndSession("User wishes to terminate session")
@@ -286,9 +286,9 @@
 	@dbus.service.method("org.ofono.SimToolkitAgent",
 					in_signature="sy", out_signature="b")
 	def ConfirmOpenChannel(self, info, icon):
-		print "Open channel confirmation: (%s)" % (info)
-		print "Icon: (%d)" % (icon)
-		key = raw_input("Enter Confirmation (t, y, n):")
+		print("Open channel confirmation: (%s)" % (info))
+		print("Icon: (%d)" % (icon))
+		key = input("Enter Confirmation (t, y, n):")
 
 		if key == 't':
 			raise EndSession("User wishes to terminate session")
@@ -298,7 +298,7 @@
 			return False
 
 _dbus2py = {
-	dbus.String : unicode,
+	dbus.String : str,
 	dbus.UInt32 : int,
 	dbus.Int32 : int,
 	dbus.Int16 : int,
@@ -346,7 +346,7 @@
 	return str(d)
 
 def property_changed(name, value):
-	print "SimToolKit property: %s changed to '%s'" % (name, pretty(value))
+	print("SimToolKit property: %s changed to '%s'" % (name, pretty(value)))
 
 if __name__ == '__main__':
 	if len(sys.argv) == 2:
@@ -376,15 +376,15 @@
 
 	if mode == 'menu':
 		if "MainMenuTitle" in properties:
-			print "Main Menu:"
-			print "%s" % (properties["MainMenuTitle"])
-			print "\n"
+			print("Main Menu:")
+			print("%s" % (properties["MainMenuTitle"]))
+			print("\n")
 
 		if "MainMenu" in properties:
-			print "Items:"
+			print("Items:")
 			index = 0
 			for item in properties["MainMenu"]:
-				print "%d. %s" % (index, item[0])
+				print("%d. %s" % (index, item[0]))
 				index += 1
 
 		path = "/test/agent"
@@ -395,7 +395,7 @@
 		except:
 			pass
 
-		select = int(raw_input("Enter Selection: "))
+		select = int(input("Enter Selection: "))
 		stk.SelectItem(select, path)
 	elif mode == 'agent':
 		path = "/test/agent"
@@ -408,10 +408,10 @@
 
 		stk.RegisterAgent(path)
 
-		print "Default Agent registered - Waiting for STK command..."
+		print("Default Agent registered - Waiting for STK command...")
 	else:
-		print "%s [menu|agent]" % (sys.argv[0])
+		print("%s [menu|agent]" % (sys.argv[0]))
 		exit(0)
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

=== modified file 'test/unlock-pin'
--- test/unlock-pin	2010-09-09 19:38:14 +0000
+++ test/unlock-pin	2014-02-28 20:44:46 +0000
@@ -17,10 +17,10 @@
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
-	print "%s [PATH] pin_type pin" % (sys.argv[0])
+	print("%s [PATH] pin_type pin" % (sys.argv[0]))
 	sys.exit(0)
 
-print "Unlock %s %s for modem %s..." % (pin_type, pin, path)
+print("Unlock %s %s for modem %s..." % (pin_type, pin, path))
 
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')

=== modified file 'unit/test-simutil.c'
--- unit/test-simutil.c	2012-11-22 16:26:34 +0000
+++ unit/test-simutil.c	2014-02-28 20:44:46 +0000
@@ -345,10 +345,12 @@
 };
 
 const unsigned char valid_efpnn[][28] = {
-	{ 0x43, 0x0a, 0x00, 0x54, 0x75, 0x78, 0x20, 0x43, 0x6f, 0x6d,
-	  0x6d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, },
-	{ 0x43, 0x05, 0x00, 0x4C, 0x6F, 0x6E, 0x67, 0x45, 0x06, 0x00,
-	  0x53, 0x68, 0x6F, 0x72, 0x74, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }
+	/* Solavei */
+	{ 0x43, 0x08, 0x87, 0xD3, 0x37, 0x3B, 0x6C, 0x2F, 0xA7, 0x01 },
+	/* T-Mobile / T-Mobile */
+	{ 0x43, 0x08, 0x80, 0xD4, 0x56, 0xF3, 0x2D, 0x4E, 0xB3, 0xCB,
+	  0x45, 0x08, 0x80, 0xD4, 0x56, 0xF3, 0x2D, 0x4E, 0xB3, 0xCB,
+	  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 };
 
 static void test_eons(void)
@@ -376,7 +378,7 @@
 	op_info = sim_eons_lookup(eons_info, "246", "81");
 	g_assert(op_info);
 
-	g_assert(!strcmp(op_info->longname, "Tux Comm"));
+	g_assert(!strcmp(op_info->longname, "Solavei"));
 	g_assert(!op_info->shortname);
 	g_assert(!op_info->info);