Remove the workaround from bug #263081 since most strings should be unicode

now.

svn path=/main/trunk/; revision=13784

diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index 5657617b373f8ab266693812d99cf27649c9844f..a0b11165f6d1ee8964c9d4aa006a2afe9e380a93 100644 (file)
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -165,18 +165,6 @@ class database(fs_template.FsBased):
                        if k not in internal_columns:
                                d[k] = result[0][column_index]
 
-               # As a temporary workaround for bug #263081, convert unicode strings
-               # to raw byte strings. This avoids potential unicode errors that can
-               # be triggered elsewhere when attempting to join unicode strings with
-               # raw byte strings. TODO: Convert all string handling code to use
-               # unicode strings instead of raw byte strings (required for py3k
-               # compatibility).
-               for k, v in d.iteritems():
-                       try:
-                               d[k] = str(v)
-                       except UnicodeEncodeError:
-                               pass
-
                return d
 
        def _setitem(self, cpv, values):