From bca795b8a2c4d91384b1b3bf2d0c0affe7ada471 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayonlinux.org>
Date: Mon, 5 Oct 2009 09:53:34 +0200
Subject: [PATCH] [unittest] more Python 3.x compatibility

---
 libraries/tests/standalone/sys_big_send_test.py     |  9 ++++++---
 .../standalone/test_RemoteDatabase_generate_sql.py  | 13 +++++++++++++
 libraries/tests/standalone/test_ftpinterface.py     |  5 +++--
 libraries/tests/standalone/test_ugc_update.py       |  4 +++-
 4 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 libraries/tests/standalone/test_RemoteDatabase_generate_sql.py

diff --git a/libraries/tests/standalone/sys_big_send_test.py b/libraries/tests/standalone/sys_big_send_test.py
index e075a1b91..84ff8a4b9 100644
--- a/libraries/tests/standalone/sys_big_send_test.py
+++ b/libraries/tests/standalone/sys_big_send_test.py
@@ -1,5 +1,8 @@
+# -*- coding: utf-8 -*-
 cmd = 'test:echo %s' % ('c'*90000,)
 
+from entropy.const import const_get_stringtype
+from entropy.output import print_generic
 from entropy.dump import unserialize_string
 from entropy.client.interfaces import Client
 from entropy.client.services.ugc.commands import Base
@@ -10,12 +13,12 @@ srv = SockClient(cl, Base, ssl = True)
 srv.connect('192.168.1.1', 2000)
 session = srv.open_session()
 srv.transmit('%s %s' % (session, cmd,))
-print("cmd answer", srv.receive())
+print_generic("cmd answer", srv.receive())
 srv.transmit('%s rc' % (session,))
 raw_data = srv.receive()
-if isinstance(raw_data, basestring):
+if isinstance(raw_data, const_get_stringtype):
     raw_data = unserialize_string(raw_data)
-print(raw_data)
+print_generic(raw_data)
 
 srv.close_session(session)
 srv.disconnect()
diff --git a/libraries/tests/standalone/test_RemoteDatabase_generate_sql.py b/libraries/tests/standalone/test_RemoteDatabase_generate_sql.py
new file mode 100644
index 000000000..773388c6e
--- /dev/null
+++ b/libraries/tests/standalone/test_RemoteDatabase_generate_sql.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+import sys
+from entropy.const import const_convert_to_unicode
+from entropy.services.skel import RemoteDatabase
+rd = RemoteDatabase()
+action = "insert"
+table = const_convert_to_unicode("òtableò", "utf-8")
+data = {
+    'user': const_convert_to_unicode("Aleò", 'utf-8'),
+    'name': const_convert_to_unicode("Pippo", 'utf-8'),
+}
+sql = rd._generate_sql(action, table, data)
+sys.stdout.write(sql.encode("utf-8") + "\n")
diff --git a/libraries/tests/standalone/test_ftpinterface.py b/libraries/tests/standalone/test_ftpinterface.py
index 97468babe..11003ed51 100644
--- a/libraries/tests/standalone/test_ftpinterface.py
+++ b/libraries/tests/standalone/test_ftpinterface.py
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from entropy.transceivers import FtpInterface
-from entropy.output import TextInterface
+from entropy.output import TextInterface, print_generic
 text = TextInterface()
 
 ftp = FtpInterface("ftp://", text)
-print(ftp.get_file_md5("test.rnd"))
+print_generic(ftp.get_file_md5("test.rnd"))
 ftp.close()
diff --git a/libraries/tests/standalone/test_ugc_update.py b/libraries/tests/standalone/test_ugc_update.py
index d0baa194a..4dbc1ea69 100644
--- a/libraries/tests/standalone/test_ugc_update.py
+++ b/libraries/tests/standalone/test_ugc_update.py
@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
+from entropy.output import print_generic
 from entropy.client.interfaces import Client
 cl = Client()
-print(cl.UGC.get_all_downloads("sabayonlinux.org"))
+print_generic(cl.UGC.get_all_downloads("sabayonlinux.org"))
 cl.destroy()
 raise SystemExit(0)