From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B152B138544 for ; Fri, 18 Jan 2013 16:37:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88B87E05D5; Fri, 18 Jan 2013 16:37:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 338E4E05D5 for ; Fri, 18 Jan 2013 16:37:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48D4533DAFD for ; Fri, 18 Jan 2013 16:37:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A2F8DE4073 for ; Fri, 18 Jan 2013 16:37:34 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1358527038.729a0d126771fc5aaae38b1221dad1aebe15345e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/cache/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/cache/sqlite.py X-VCS-Directories: pym/portage/cache/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 729a0d126771fc5aaae38b1221dad1aebe15345e X-VCS-Branch: master Date: Fri, 18 Jan 2013 16:37:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: db7582c2-c64d-416b-bdd2-92b2fb951aa3 X-Archives-Hash: b7b3e00b4547bb42524d691c21718415 commit: 729a0d126771fc5aaae38b1221dad1aebe15345e Author: Zac Medico gentoo org> AuthorDate: Fri Jan 18 16:37:18 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jan 18 16:37:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=729a0d12 cache/sqlite.py: unicode_literals --- pym/portage/cache/sqlite.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py index 9c1b3eb..8a9f747 100644 --- a/pym/portage/cache/sqlite.py +++ b/pym/portage/cache/sqlite.py @@ -1,6 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +from __future__ import unicode_literals + import re import sys from portage.cache import fs_template @@ -21,7 +23,6 @@ class database(fs_template.FsBased): # to calculate the number of pages requested, according to the following # equation: cache_bytes = page_bytes * page_count cache_bytes = 1024 * 1024 * 10 - _EMPTY_STRING = _unicode_decode("") def __init__(self, *args, **config): super(database, self).__init__(*args, **config) @@ -215,7 +216,7 @@ class database(fs_template.FsBased): v = result[column_index] if v is None: # This happens after a new empty column has been added. - v = self._EMPTY_STRING + v = "" d[k] = v return d