From 353218995dd8cdb1b2b168af75835ed2091d57e5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 4 Jul 2009 19:57:22 +0000 Subject: Remove the workaround from bug #263081 since most strings should be unicode now. svn path=/main/trunk/; revision=13784 --- pym/portage/cache/sqlite.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py index 5657617b3..a0b11165f 100644 --- 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): -- cgit v1.2.3-1-g7c22