| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-01 12:55:49 +0000 (Tue, 01 Jul 2008) |
| 3 |
New Revision: 10875 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
main/trunk/pym/portage/cache/mappings.py |
| 8 |
main/trunk/pym/portage/cache/template.py |
| 9 |
Log: |
| 10 |
Py3k compatibility patch #6 by Ali Polatel <hawking@g.o>. |
| 11 |
Replace dict.has_key() calls with "in" and "not in" operators. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/portage/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/portage/__init__.py 2008-07-01 12:53:07 UTC (rev 10874) |
| 17 |
+++ main/trunk/pym/portage/__init__.py 2008-07-01 12:55:49 UTC (rev 10875) |
| 18 |
@@ -30,6 +30,7 @@ |
| 19 |
import UserDict |
| 20 |
from itertools import chain, izip |
| 21 |
import platform |
| 22 |
+ import warnings |
| 23 |
except ImportError, e: |
| 24 |
sys.stderr.write("\n\n") |
| 25 |
sys.stderr.write("!!! Failed to complete python imports. These are internal modules for\n") |
| 26 |
@@ -2759,6 +2760,9 @@ |
| 27 |
return v |
| 28 |
|
| 29 |
def has_key(self,mykey): |
| 30 |
+ warnings.warn("portage.config.has_key() is deprecated, " |
| 31 |
+ "use the in operator instead", |
| 32 |
+ DeprecationWarning) |
| 33 |
return mykey in self |
| 34 |
|
| 35 |
def __contains__(self, mykey): |
| 36 |
|
| 37 |
Modified: main/trunk/pym/portage/cache/mappings.py |
| 38 |
=================================================================== |
| 39 |
--- main/trunk/pym/portage/cache/mappings.py 2008-07-01 12:53:07 UTC (rev 10874) |
| 40 |
+++ main/trunk/pym/portage/cache/mappings.py 2008-07-01 12:55:49 UTC (rev 10875) |
| 41 |
@@ -4,6 +4,7 @@ |
| 42 |
# $Id$ |
| 43 |
|
| 44 |
import UserDict |
| 45 |
+import warnings |
| 46 |
import weakref |
| 47 |
|
| 48 |
class ProtectedDict(UserDict.DictMixin): |
| 49 |
@@ -55,9 +56,14 @@ |
| 50 |
return list(self.__iter__()) |
| 51 |
|
| 52 |
|
| 53 |
- def has_key(self, key): |
| 54 |
+ def __contains__(self, key): |
| 55 |
return key in self.new or (key not in self.blacklist and key in self.orig) |
| 56 |
|
| 57 |
+ def has_key(self, key): |
| 58 |
+ warnings.warn("portage.cache.mapping.ProtectedDict.has_key() is" |
| 59 |
+ " deprecated, use the in operator instead", |
| 60 |
+ DeprecationWarning) |
| 61 |
+ return key in self |
| 62 |
|
| 63 |
class LazyLoad(UserDict.DictMixin): |
| 64 |
""" |
| 65 |
@@ -91,6 +97,9 @@ |
| 66 |
|
| 67 |
|
| 68 |
def has_key(self, key): |
| 69 |
+ warnings.warn("portage.cache.mappings.LazyLoad.has_key() is " |
| 70 |
+ "deprecated, use the in operator instead", |
| 71 |
+ DeprecationWarning) |
| 72 |
return key in self |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
Modified: main/trunk/pym/portage/cache/template.py |
| 77 |
=================================================================== |
| 78 |
--- main/trunk/pym/portage/cache/template.py 2008-07-01 12:53:07 UTC (rev 10874) |
| 79 |
+++ main/trunk/pym/portage/cache/template.py 2008-07-01 12:55:49 UTC (rev 10875) |
| 80 |
@@ -6,6 +6,7 @@ |
| 81 |
from portage.cache import cache_errors |
| 82 |
from portage.cache.cache_errors import InvalidRestriction |
| 83 |
from portage.cache.mappings import ProtectedDict |
| 84 |
+import warnings |
| 85 |
|
| 86 |
class database(object): |
| 87 |
# this is for metadata/cache transfer. |
| 88 |
@@ -121,6 +122,9 @@ |
| 89 |
if self.has_key is database.has_key: |
| 90 |
# prevent a possible recursive loop |
| 91 |
raise NotImplementedError |
| 92 |
+ warnings.warn("portage.cache.template.database.has_key() is " |
| 93 |
+ "deprecated, override __contains__ instead", |
| 94 |
+ DeprecationWarning) |
| 95 |
return self.has_key(cpv) |
| 96 |
|
| 97 |
def __iter__(self): |
| 98 |
|
| 99 |
-- |
| 100 |
gentoo-commits@l.g.o mailing list |
Archives