diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-30 10:36:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-30 10:36:51 +0000 |
| commit | dd9eae496d76a7691f1c16fc5fa251fa9a0ed4de (patch) | |
| tree | 75516b7a9c5967b25a9c2fb794f0ebb7700f2be5 /pym/portage/cache | |
| parent | 49792399a31a03e3810a29829d716453533c849a (diff) | |
| download | portage-dd9eae496d76a7691f1c16fc5fa251fa9a0ed4de.tar.gz portage-dd9eae496d76a7691f1c16fc5fa251fa9a0ed4de.tar.bz2 portage-dd9eae496d76a7691f1c16fc5fa251fa9a0ed4de.zip | |
Bug #283223 - Don't call str() inside _db_escape_string(), since it's
redundant and it can trigger a UnicodeEncodeError in python-2.x.
svn path=/main/trunk/; revision=14171
Diffstat (limited to 'pym/portage/cache')
| -rw-r--r-- | pym/portage/cache/sqlite.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py index 0a8424880..81c076257 100644 --- a/pym/portage/cache/sqlite.py +++ b/pym/portage/cache/sqlite.py @@ -48,7 +48,7 @@ class database(fs_template.FsBased): def _db_escape_string(self, s): """meta escaping, returns quoted string for use in sql statements""" # This is equivalent to the _quote function from pysqlite 1.1. - return "'%s'" % str(s).replace("'","''") + return "'%s'" % s.replace("'", "''") def _db_init_connection(self, config): self._dbpath = self.location + ".sqlite" |