Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15525 - main/branches/2.1.7/pym/portage/cache
Date: Tue, 02 Mar 2010 19:49:00
Message-Id: E1NmY5Q-00061l-Ey@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-03-02 19:48:56 +0000 (Tue, 02 Mar 2010)
3 New Revision: 15525
4
5 Modified:
6 main/branches/2.1.7/pym/portage/cache/anydbm.py
7 Log:
8 fix: python dbm module doesn't accept unicode as key (trunk r15286)
9
10 Modified: main/branches/2.1.7/pym/portage/cache/anydbm.py
11 ===================================================================
12 --- main/branches/2.1.7/pym/portage/cache/anydbm.py 2010-03-02 19:48:43 UTC (rev 15524)
13 +++ main/branches/2.1.7/pym/portage/cache/anydbm.py 2010-03-02 19:48:56 UTC (rev 15525)
14 @@ -63,10 +63,10 @@
15
16 def _getitem(self, cpv):
17 # we override getitem because it's just a cpickling of the data handed in.
18 - return pickle.loads(self.__db[cpv])
19 + return pickle.loads(self.__db[_unicode_encode(cpv)])
20
21 def _setitem(self, cpv, values):
22 - self.__db[cpv] = pickle.dumps(values,pickle.HIGHEST_PROTOCOL)
23 + self.__db[_unicode_encode(cpv)] = pickle.dumps(values,pickle.HIGHEST_PROTOCOL)
24
25 def _delitem(self, cpv):
26 del self.__db[cpv]