diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:09:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:09:52 +0000 |
| commit | de59d697d76e786e31d12e32f3fefa2e8d8a3e7e (patch) | |
| tree | 335d28e2ae48fd8a029599aefd8615caef07b6b0 /pym | |
| parent | b6cdee63acbf7ef995f86eaf3f72ea37c94ecd03 (diff) | |
| download | portage-de59d697d76e786e31d12e32f3fefa2e8d8a3e7e.tar.gz portage-de59d697d76e786e31d12e32f3fefa2e8d8a3e7e.tar.bz2 portage-de59d697d76e786e31d12e32f3fefa2e8d8a3e7e.zip | |
Add ObjectProxy __gt__, __ge__, __lt__, and __le__ methods to fix TypeError
with python3 reported by Arfrever:
File "/usr/lib/portage/pym/portage/__init__.py", line 513, in portageexit
if secpass > 1 and os.environ.get("SANDBOX_ON") != "1":
TypeError: unorderable types: _LazyImportFrom() > int() (trunk r15497)
svn path=/main/branches/2.1.7/; revision=15698
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/proxy/objectproxy.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 9d0f929b2..213d4ebb5 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -510,7 +510,7 @@ auxdbkeys = ( auxdbkeylen=len(auxdbkeys) def portageexit(): - if secpass > 1 and os.environ.get("SANDBOX_ON") != "1": + if data.secpass > 1 and os.environ.get("SANDBOX_ON") != "1": close_portdbapi_caches() try: mtimedb diff --git a/pym/portage/proxy/objectproxy.py b/pym/portage/proxy/objectproxy.py index d392beb60..3e5191671 100644 --- a/pym/portage/proxy/objectproxy.py +++ b/pym/portage/proxy/objectproxy.py @@ -61,6 +61,18 @@ class ObjectProxy(object): def __hash__(self): return hash(object.__getattribute__(self, '_get_target')()) + def __ge__(self, other): + return object.__getattribute__(self, '_get_target')() >= other + + def __gt__(self, other): + return object.__getattribute__(self, '_get_target')() > other + + def __le__(self, other): + return object.__getattribute__(self, '_get_target')() <= other + + def __lt__(self, other): + return object.__getattribute__(self, '_get_target')() < other + def __eq__(self, other): return object.__getattribute__(self, '_get_target')() == other |