| 1 |
Author: zmedico |
| 2 |
Date: 2009-07-04 19:57:22 +0000 (Sat, 04 Jul 2009) |
| 3 |
New Revision: 13784 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/cache/sqlite.py |
| 7 |
Log: |
| 8 |
Remove the workaround from bug #263081 since most strings should be unicode |
| 9 |
now. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/cache/sqlite.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/cache/sqlite.py 2009-07-04 19:55:12 UTC (rev 13783) |
| 15 |
+++ main/trunk/pym/portage/cache/sqlite.py 2009-07-04 19:57:22 UTC (rev 13784) |
| 16 |
@@ -165,18 +165,6 @@ |
| 17 |
if k not in internal_columns: |
| 18 |
d[k] = result[0][column_index] |
| 19 |
|
| 20 |
- # As a temporary workaround for bug #263081, convert unicode strings |
| 21 |
- # to raw byte strings. This avoids potential unicode errors that can |
| 22 |
- # be triggered elsewhere when attempting to join unicode strings with |
| 23 |
- # raw byte strings. TODO: Convert all string handling code to use |
| 24 |
- # unicode strings instead of raw byte strings (required for py3k |
| 25 |
- # compatibility). |
| 26 |
- for k, v in d.iteritems(): |
| 27 |
- try: |
| 28 |
- d[k] = str(v) |
| 29 |
- except UnicodeEncodeError: |
| 30 |
- pass |
| 31 |
- |
| 32 |
return d |
| 33 |
|
| 34 |
def _setitem(self, cpv, values): |
Archives