diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-04 19:57:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-04 19:57:22 +0000 |
| commit | 353218995dd8cdb1b2b168af75835ed2091d57e5 (patch) | |
| tree | 8c352eff67792e0d0e41b403880524e9d261af26 /pym/portage/cache/sqlite.py | |
| parent | 232af5c57f1b2e8eb0c7c41a2377e3b0292d243b (diff) | |
| download | portage-353218995dd8cdb1b2b168af75835ed2091d57e5.tar.gz portage-353218995dd8cdb1b2b168af75835ed2091d57e5.tar.bz2 portage-353218995dd8cdb1b2b168af75835ed2091d57e5.zip | |
Remove the workaround from bug #263081 since most strings should be unicode
now.
svn path=/main/trunk/; revision=13784
Diffstat (limited to 'pym/portage/cache/sqlite.py')
| -rw-r--r-- | pym/portage/cache/sqlite.py | 12 |
1 files changed, 0 insertions, 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): |