diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-02-28 11:31:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-02-28 11:31:45 +0000 |
| commit | 8fded88163b4038aed84e49da935e6a5055d3d2d (patch) | |
| tree | 38658c180416f2b998699db7c62e939fbec269c2 | |
| parent | Fix broken reference to portage._spawn_misc_sh(). Thanks to Arfrever for (diff) | |
| download | portage-multirepo-8fded88163b4038aed84e49da935e6a5055d3d2d.tar.gz portage-multirepo-8fded88163b4038aed84e49da935e6a5055d3d2d.tar.bz2 portage-multirepo-8fded88163b4038aed84e49da935e6a5055d3d2d.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()
svn path=/main/trunk/; revision=15497
| -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 9d0f929b..213d4ebb 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 d392beb6..3e519167 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 |